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:58:38 -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
azure-pipelines.yml
+3 -3
View File
@@ -138,9 +138,9 @@ steps:
export PDCURSES_TOP=../submodules/pdcurses export PDCURSES_TOP=../submodules/pdcurses
export LUA_VERSION=5.4.4 export LUA_VERSION=5.4.4
cp ../sys/windows/Makefile.mingw32* . cp ../sys/windows/Makefile.mingw32* .
mingw32-make -f Makefile.mingw32 LUA_VERSION=$LUA_VERSION clean mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=MINGW32 LUA_VERSION=$LUA_VERSION clean
mingw32-make -f Makefile.mingw32 LUA_VERSION=$LUA_VERSION depend mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=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
condition: eq( variables.toolchain, 'mingw' ) condition: eq( variables.toolchain, 'mingw' )
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src
displayName: 'MinGW Build' displayName: 'MinGW Build'
sys/windows/Makefile.mingw32
+4 -5
View File
@@ -200,9 +200,8 @@ USE_DLB = Y
#========================================== #==========================================
ifdef CI_COMPILER ifdef CI_COMPILER
cc = i686-w64-mingw32-gcc.exe cc = gcc -c
ld = i686-w64-mingw32-gcc.exe ld = gcc
rc = windres --target=pe-i386
# the mingw version on our CI is missing # the mingw version on our CI is missing
# winres.h. This will cause the Makefile.mingw32 # winres.h. This will cause the Makefile.mingw32
# to put a temporary copy into one of our folders # to put a temporary copy into one of our folders
@@ -211,13 +210,13 @@ MISSING_HEADER = Y
else else
cc = gcc -c cc = gcc -c
ld = gcc ld = gcc
MISSING_HEADER = N
endif
ifeq "$(MSYSTEM)" "MINGW32" ifeq "$(MSYSTEM)" "MINGW32"
rc = windres --target=pe-i386 rc = windres --target=pe-i386
else # MINGW64 else # MINGW64
rc = windres --target=pe-x86-64 rc = windres --target=pe-x86-64
endif endif
MISSING_HEADER = N
endif
# #
# Handle user settings # Handle user settings