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

diff --git a/.travis.yml b/.travis.yml
index 21bd109d2ef51823c904485553455328cf427fc6..0b1e388a0f9bdd1a4605979cbdf1ac683aa9b3e1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -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

diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.2020
index 45d0ce0189671ad4b1158d47770c165f8342afe2..7bc1288a6484c31eb05bee7e74a6cf6dfa4d0fde 100644 (file)
--- a/sys/unix/hints/include/cross-post.2020
+++ b/sys/unix/hints/include/cross-post.2020
@@ -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

diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index 7967037543fd5a2908e99e5516bea9ae5c02bd67..77ee5b3f721220d717fa116156df6a278c2900c7 100644 (file)
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -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
 #===============-=================================================