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

msdos cross-compile follow-up bits

Browse Source 
add missing make rule for ../win/share files to cross-pre.2020

adjust .travis.yml to use the new approach for building msdos target
This commit is contained in:
nhmall
2020-09-29 09:41:31 -04:00
parent 560ace217b
commit 5e9303f9df
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -3
View File
@@ -138,7 +138,7 @@ matrix:
- mingw32-make LUA_VERSION=$LUA_VERSION install - mingw32-make LUA_VERSION=$LUA_VERSION install
- name: msdos-linux-focal-djgpp-crosscompile - name: msdos-linux-focal-djgpp-crosscompile
os: linux os: linux
env: HINTS=linux LUA_VERSION=5.4.0 env: HINTS=linux.2020 LUA_VERSION=5.4.0
dist: focal dist: focal
compiler: gcc compiler: gcc
script: script:
@@ -148,8 +148,9 @@ matrix:
- cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
- make fetch-lua - make fetch-lua
- test -d "lib/lua-$LUA_VERSION/src" || exit 0 - test -d "lib/lua-$LUA_VERSION/src" || exit 0
- cd lib/lua-$LUA_VERSION/src && make CC='gcc' a && cd ../../.. - sh sys/msdos/fetch-cross-compiler.sh
- sh sys/msdos/msdos-cross-compile.sh - make LUA_VERSION=$LUA_VERSION WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 all
- make LUA_VERSION=$LUA_VERSION WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
exclude: exclude:
# - os: osx # - os: osx
# osx_image: xcode10.3 # osx_image: xcode10.3
sys/unix/hints/include/cross-post.2020
+1
View File
@@ -18,6 +18,7 @@ $(TARGETPFX)vidvesa.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(TARGETPFX)vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \ $(TARGETPFX)vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(HACK_H) $(HACK_H)
$(TARGETPFX)tile.o : tile.c $(TARGETPFX)tile.o : tile.c
$(TARGETPFX)recover.o : ../util/recover.c
# #
#.PHONY: dospkg #.PHONY: dospkg
dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
sys/unix/hints/include/cross-pre.2020
+3 -1
View File
@@ -283,7 +283,9 @@ ifdef WANT_WIN_CURSES
$(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c $(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $< $(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
endif # WANT_WIN_CURSES endif # WANT_WIN_CURSES
# Rules for win/share files
$(TARGETPFX)%.o : ../win/share/%.c
$(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
# #
# End of cross-compiling -PRE section # End of cross-compiling -PRE section
#===============-================================================= #===============-=================================================