nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

update for mingw build within CI

Browse Source
This commit is contained in:
nhmall
2022-01-29 13:52:18 -05:00
parent 4db0afe785
commit 9b38353833
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
azure-pipelines.yml
View File

@@ -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'

9
sys/windows/Makefile.mingw32
View File

@@ -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