Possibly fix Windows build.

diff --git a/extras/build-tests/windows/build.bat b/extras/build-tests/windows/build.bat
index f706cb1d9fa9948eb5ed0b057da1c482af9f3be7..eca6b67d7463243be01937cf7be489311720ffee 100644 (file)
--- a/extras/build-tests/windows/build.bat
+++ b/extras/build-tests/windows/build.bat
@@ -38,7 +38,10 @@ IF NOT EXIST src\version.c nmake -f Makefile.windows CONF
 rem - Then build most of UnrealIRCd.exe etc
 call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat UNREALSVC.EXE UnrealIRCd.exe unrealircdctl.exe
 rem - It will fail due to missing symbolfile, which we create here..
-nmake -f makefile.windows SYMBOLFILE
+rem   it needs to run with SLOW=1 because JOM doesn't understand things otherwise..
+SET SLOW=1
+call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat SYMBOLFILE
+SET SLOW=0
 rem - Then we finalize building UnrealIRCd.exe: should be no error
 call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat UNREALSVC.EXE UnrealIRCd.exe unrealircdctl.exe
 if %ERRORLEVEL% NEQ 0 EXIT /B 1

diff --git a/extras/build-tests/windows/compilecmd/vs2019.bat b/extras/build-tests/windows/compilecmd/vs2019.bat
index a7247a006bb6f9a1b7304b3bbaf837325e120216..ecd5935abb342ffb2f057d0b753e3166c42e9e8f 100644 (file)
--- a/extras/build-tests/windows/compilecmd/vs2019.bat
+++ b/extras/build-tests/windows/compilecmd/vs2019.bat
@@ -1,9 +1,19 @@
 rem Build command for Visual Studio 2019
 
-rem This used to start with:
-rem nmake -f makefile.windows ^
-rem But nowadays we use JOM for parallel builds:
-jom /j32 -f makefile.windows ^
+rem Default to quick parallel builds
+SET BUILDCOMMAND="jom"
+SET BUILDARGS="/j32"
+
+IF NOT %SLOW%. == 1. goto cont
+rem In case of SET SLOW=1 we use slow nmake
+SET BUILDCOMMAND="nmake"
+SET BUILDARGS=""
+
+:cont
+echo BUILDCOMMAND IS: %BUILDCOMMAND%
+echo BUILDARGS IS: %BUILDARGS%
+
+%BUILDCOMMAND% %BUILDARGS% -f makefile.windows ^
 LIBRESSL_INC_DIR="c:\projects\unrealircd-6-libs\libressl\include" ^
 LIBRESSL_LIB_DIR="c:\projects\unrealircd-6-libs\libressl\lib" ^
 SSLLIB="crypto-50.lib ssl-53.lib" ^