From f58a14c2d32c1bc2984308ccd72b8fdec1b643d6 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 24 Nov 2023 12:29:39 +0900 Subject: [PATCH] [build] Disable 32-bit win32 in release build script 32-bit Windows isn't relevant enough any more. Anybody that wants 32-bit windows QuakeForge can go through the pain. --- tools/build_scripts/qf-release | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/build_scripts/qf-release b/tools/build_scripts/qf-release index 6b6972dc7..22610227e 100755 --- a/tools/build_scripts/qf-release +++ b/tools/build_scripts/qf-release @@ -105,22 +105,21 @@ if test $do_win32 -eq 1; then qf_win32_dir=`pwd`"/$qf_win32" qf_win64="quakeforge-$ver-win64" qf_win64_dir=`pwd`"/$qf_win64" - rm -rf $qf_win32_dir *.zip + #rm -rf $qf_win32_dir *.zip rm -rf $qf_win64_dir *.zip - ../tools/cross/mingw/cross-configure.sh \ - --disable-debug \ - --program-prefix= + #../tools/cross/mingw/cross-configure.sh \ + # --disable-debug \ + # --program-prefix= ../tools/cross/mingw64/cross-configure.sh \ --disable-debug \ --program-prefix= - ../tools/cross/mingw/cross-make.sh $QFSMP - ../tools/cross/mingw/cross-make.sh \ - prefix=${qf_win32_dir} \ - exec_prefix=${qf_win32_dir} \ - pkgdatadir=${qf_win32_dir}/QF \ - sharepath=${qf_win64_dir}/QF \ - man1dir=${qf_win32_dir} \ - install + #../tools/cross/mingw/cross-make.sh $QFSMP \ + # prefix=${qf_win32_dir} \ + # exec_prefix=${qf_win32_dir} \ + # pkgdatadir=${qf_win32_dir}/QF \ + # sharepath=${qf_win64_dir}/QF \ + # man1dir=${qf_win32_dir} \ + # install ../tools/cross/mingw64/cross-make.sh $QFSMP \ prefix=${qf_win64_dir} \ exec_prefix=${qf_win64_dir} \ @@ -129,14 +128,14 @@ if test $do_win32 -eq 1; then man1dir=${qf_win64_dir} \ install mkdir -p ${qf_win32_dir}/pkgconfig ${qf_win64_dir}/pkgconfig - mv ${qf_win32_dir}/lib/pkgconfig/*.pc ${qf_win32_dir}/pkgconfig + #mv ${qf_win32_dir}/lib/pkgconfig/*.pc ${qf_win32_dir}/pkgconfig mv ${qf_win64_dir}/lib/pkgconfig/*.pc ${qf_win64_dir}/pkgconfig eval `grep MINGW= ../tools/cross/mingw/cross-configure.sh` MGWi686=i686-w64-mingw32.static MGWx86_64=x86_64-w64-mingw32.static - $MINGW/usr/bin/$MGWi686-strip --strip-unneeded "$qf_win32"/bin/*.exe + #$MINGW/usr/bin/$MGWi686-strip --strip-unneeded "$qf_win32"/bin/*.exe $MINGW/usr/bin/$MGWx86_64-strip --strip-unneeded "$qf_win64"/bin/*.exe - ../tools/build_scripts/qf-win32.py "$ver-win32" quakeforge "$qf_win32" + #../tools/build_scripts/qf-win32.py "$ver-win32" quakeforge "$qf_win32" ../tools/build_scripts/qf-win32.py "$ver-win64" quakeforge "$qf_win64" mv *.zip $RELEASE cd ..