fix an error with msdos cross-compiler NetHack packaging

diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross
index 3cc9260157b3fa113fc07ae57b6019e659666e3e..38d8615b269f28232af38a21adac72cacf5f4510 100644 (file)
--- a/sys/msdos/Makefile2.cross
+++ b/sys/msdos/Makefile2.cross
@@ -313,6 +313,8 @@ SOBJ   = $(O)msdos.o    $(O)pcsys.o    $(O)tty.o        $(O)unix.o \
 
 VVOBJ  = $(O)version.o
 
+MDLIB  = $(O)mdlib.o
+
 ifeq "$(ADD_LUA)" "Y"
 LUAOBJ = $(O)nhlua.o    $(O)nhlsel.o
 endif
@@ -329,7 +331,7 @@ VOBJ  = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \
        $(VOBJ11) $(VOBJ12) $(VOBJ13) $(VOBJ14) $(VOBJ15) \
        $(VOBJ16) $(VOBJ17) $(VOBJ18) $(VOBJ19) $(VOBJ20) \
        $(VOBJ21) $(VOBJ22) $(VOBJ23) $(VOBJ24) $(VOBJ25) \
-       $(LUAOBJ) $(CURSESOBJ) 
+       $(LUAOBJ) $(CURSESOBJ) $(MDLIB)
 
 ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
 
@@ -665,6 +667,7 @@ endif
 ifeq "$(ADD_CURSES)" "Y"
        @$(TARGET_AR) r temp.a $(CURSESOBJ)
 endif
+       @$(TARGET_AR) r temp.a $(MDLIB)
        $(TARGET_LINK) $(LFLAGS) -o$(GAME).exe temp.a $(PDCLIB) $(LUALIB) $(LIBRARIES) $(ZLIB)
        $(TARGET_STUBEDIT) $(GAME).exe minstack=2048K
        cp $(GAME).exe $(GAMEFILE)

diff --git a/sys/msdos/msdos-cross-compile.sh b/sys/msdos/msdos-cross-compile.sh
index c5de2b97f84aa6ec994e12d2aef8401c1d8215d0..1e20b0931e3acb448c43881c28eb49c01426cacf 100644 (file)
--- a/sys/msdos/msdos-cross-compile.sh
+++ b/sys/msdos/msdos-cross-compile.sh
@@ -39,7 +39,7 @@ if [ ! -d cwsdpmi ]; then
 fi
 cd ../src
 pwd
-mkdir -p ../binary
+mkdir -p ../msdos-binary
 cp ../dat/data.base ../dat/data.bas
 cp ../include/patchlevel.h ../include/patchlev.h
 cp ../doc/Guidebook.txt ../doc/guidebk.txt
@@ -53,8 +53,11 @@ export
 pwd
 make -f Makefile2
 unset GCC_EXEC_PREFIX
-if [ -f $TRAVIS_BUILD_DIR/djgpp/cwsdpmi/bin/cwsdpmi.exe ]; then
-    cp $TRAVIS_BUILD_DIR/djgpp/cwsdpmi/bin/cwsdpmi.exe ../binary/CWSDPMI.EXE;
+pwd
+ls ../djgpp/cwsdpmi/bin 
+ls .
+if [ -f ../djgpp/cwsdpmi/bin/CWSDPMI.EXE ]; then
+    cp  ../djgpp/cwsdpmi/bin/CWSDPMI.EXE ../msdos-binary/CWSDPMI.EXE;
 fi
-ls -l ../binary
+ls -l ../msdos-binary