update for mingw build within CI

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 34a8eaa31308cbd2d4eede950d1cc3b5d30c0d7f..4d802b21578cd696a68c849ed905cfedeccfc5b7 100644 (file)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -138,9 +138,9 @@ steps:
     export PDCURSES_TOP=../submodules/pdcurses
     export LUA_VERSION=5.4.4
     cp ../sys/windows/Makefile.mingw32* .
-    mingw32-make -f Makefile.mingw32 LUA_VERSION=$LUA_VERSION clean
-    mingw32-make -f Makefile.mingw32 LUA_VERSION=$LUA_VERSION depend
-    mingw32-make -f Makefile.mingw32 LUA_VERSION=$LUA_VERSION
+    mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=MINGW32 LUA_VERSION=$LUA_VERSION clean
+    mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=MINGW32 LUA_VERSION=$LUA_VERSION depend
+    mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=MINGW32 LUA_VERSION=$LUA_VERSION
   condition: eq( variables.toolchain, 'mingw' )
   workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src
   displayName: 'MinGW Build'

diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32
index 25c8e69c3fe66eccc28df98f31995d9f5d17f6a5..548ae868d3535536bc582e44d84e5b7019cec678 100644 (file)
--- a/sys/windows/Makefile.mingw32
+++ b/sys/windows/Makefile.mingw32
@@ -200,9 +200,8 @@ USE_DLB = Y
 #==========================================
 
 ifdef CI_COMPILER
-cc = i686-w64-mingw32-gcc.exe
-ld = i686-w64-mingw32-gcc.exe
-rc = windres --target=pe-i386
+cc = gcc -c
+ld = gcc
 # the mingw version on our CI is missing
 # winres.h. This will cause the Makefile.mingw32
 # to put a temporary copy into one of our folders
@@ -211,13 +210,13 @@ MISSING_HEADER = Y
 else
 cc = gcc -c
 ld = gcc
+MISSING_HEADER = N
+endif
 ifeq "$(MSYSTEM)" "MINGW32"
 rc = windres --target=pe-i386
 else # MINGW64
 rc = windres --target=pe-x86-64
 endif
-MISSING_HEADER = N
-endif
 
 #
 # Handle user settings