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

fix an error with msdos cross-compiler NetHack packaging

Browse Source
This commit is contained in:
nhmall
2019-11-23 01:30:54 -05:00
parent 1e0c03b3f6
commit 11678e72f2
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/msdos/Makefile2.cross
+4 -1
View File
@@ -313,6 +313,8 @@ SOBJ = $(O)msdos.o $(O)pcsys.o $(O)tty.o $(O)unix.o \
VVOBJ = $(O)version.o VVOBJ = $(O)version.o
MDLIB = $(O)mdlib.o
ifeq "$(ADD_LUA)" "Y" ifeq "$(ADD_LUA)" "Y"
LUAOBJ = $(O)nhlua.o $(O)nhlsel.o LUAOBJ = $(O)nhlua.o $(O)nhlsel.o
endif endif
@@ -329,7 +331,7 @@ VOBJ = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \
$(VOBJ11) $(VOBJ12) $(VOBJ13) $(VOBJ14) $(VOBJ15) \ $(VOBJ11) $(VOBJ12) $(VOBJ13) $(VOBJ14) $(VOBJ15) \
$(VOBJ16) $(VOBJ17) $(VOBJ18) $(VOBJ19) $(VOBJ20) \ $(VOBJ16) $(VOBJ17) $(VOBJ18) $(VOBJ19) $(VOBJ20) \
$(VOBJ21) $(VOBJ22) $(VOBJ23) $(VOBJ24) $(VOBJ25) \ $(VOBJ21) $(VOBJ22) $(VOBJ23) $(VOBJ24) $(VOBJ25) \
$(LUAOBJ) $(CURSESOBJ) $(LUAOBJ) $(CURSESOBJ) $(MDLIB)
ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ) ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
@@ -665,6 +667,7 @@ endif
ifeq "$(ADD_CURSES)" "Y" ifeq "$(ADD_CURSES)" "Y"
@$(TARGET_AR) r temp.a $(CURSESOBJ) @$(TARGET_AR) r temp.a $(CURSESOBJ)
endif endif
@$(TARGET_AR) r temp.a $(MDLIB)
$(TARGET_LINK) $(LFLAGS) -o$(GAME).exe temp.a $(PDCLIB) $(LUALIB) $(LIBRARIES) $(ZLIB) $(TARGET_LINK) $(LFLAGS) -o$(GAME).exe temp.a $(PDCLIB) $(LUALIB) $(LIBRARIES) $(ZLIB)
$(TARGET_STUBEDIT) $(GAME).exe minstack=2048K $(TARGET_STUBEDIT) $(GAME).exe minstack=2048K
cp $(GAME).exe $(GAMEFILE) cp $(GAME).exe $(GAMEFILE)
sys/msdos/msdos-cross-compile.sh
+7 -4
View File
@@ -39,7 +39,7 @@ if [ ! -d cwsdpmi ]; then
fi fi
cd ../src cd ../src
pwd pwd
mkdir -p ../binary mkdir -p ../msdos-binary
cp ../dat/data.base ../dat/data.bas cp ../dat/data.base ../dat/data.bas
cp ../include/patchlevel.h ../include/patchlev.h cp ../include/patchlevel.h ../include/patchlev.h
cp ../doc/Guidebook.txt ../doc/guidebk.txt cp ../doc/Guidebook.txt ../doc/guidebk.txt
@@ -53,8 +53,11 @@ export
pwd pwd
make -f Makefile2 make -f Makefile2
unset GCC_EXEC_PREFIX unset GCC_EXEC_PREFIX
if [ -f $TRAVIS_BUILD_DIR/djgpp/cwsdpmi/bin/cwsdpmi.exe ]; then pwd
cp $TRAVIS_BUILD_DIR/djgpp/cwsdpmi/bin/cwsdpmi.exe ../binary/CWSDPMI.EXE; ls ../djgpp/cwsdpmi/bin
ls .
if [ -f ../djgpp/cwsdpmi/bin/CWSDPMI.EXE ]; then
cp ../djgpp/cwsdpmi/bin/CWSDPMI.EXE ../msdos-binary/CWSDPMI.EXE;
fi fi
ls -l ../binary ls -l ../msdos-binary