msdos cross-compile follow-up bits
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:
@@ -138,7 +138,7 @@ matrix:
|
||||
- mingw32-make LUA_VERSION=$LUA_VERSION install
|
||||
- name: msdos-linux-focal-djgpp-crosscompile
|
||||
os: linux
|
||||
env: HINTS=linux LUA_VERSION=5.4.0
|
||||
env: HINTS=linux.2020 LUA_VERSION=5.4.0
|
||||
dist: focal
|
||||
compiler: gcc
|
||||
script:
|
||||
@@ -148,8 +148,9 @@ matrix:
|
||||
- cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
|
||||
- make fetch-lua
|
||||
- test -d "lib/lua-$LUA_VERSION/src" || exit 0
|
||||
- cd lib/lua-$LUA_VERSION/src && make CC='gcc' a && cd ../../..
|
||||
- sh sys/msdos/msdos-cross-compile.sh
|
||||
- sh sys/msdos/fetch-cross-compiler.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:
|
||||
# - os: osx
|
||||
# osx_image: xcode10.3
|
||||
|
||||
@@ -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 \
|
||||
$(HACK_H)
|
||||
$(TARGETPFX)tile.o : tile.c
|
||||
$(TARGETPFX)recover.o : ../util/recover.c
|
||||
#
|
||||
#.PHONY: dospkg
|
||||
dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
|
||||
|
||||
@@ -283,7 +283,9 @@ ifdef WANT_WIN_CURSES
|
||||
$(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
|
||||
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
|
||||
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
|
||||
#===============-=================================================
|
||||
|
||||
Reference in New Issue
Block a user