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

update Windows Makefiles to support TRAVIS CI builds

Browse Source
This commit is contained in:
nhmall
2019-06-30 01:09:41 -04:00
parent 8d0edeb4ff
commit 51f2d610e2
3 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/winnt/Makefile.gcc
+50 -30
View File
@@ -138,6 +138,13 @@ SKIP_NETHACKW=Y
#============================================================================== #==============================================================================
# The version of the game this Makefile was designed for
NETHACK_VERSION="3.6.3"
# A brief version for use in macros
NHV1=$(subst .,,$(NETHACK_VERSION))
NHV=$(subst ",,$(NHV1))
# #
# Source directories. Makedefs hardcodes these, don't change them. # Source directories. Makedefs hardcodes these, don't change them.
# #
@@ -336,7 +343,7 @@ ifneq "$(SKIP_NETHACKW)" "Y"
GUIOBJ = $(O)mhaskyn.o $(O)mhdlg.o \ GUIOBJ = $(O)mhaskyn.o $(O)mhdlg.o \
$(O)mhfont.o $(O)mhinput.o $(O)mhmain.o $(O)mhmap.o \ $(O)mhfont.o $(O)mhinput.o $(O)mhmain.o $(O)mhmap.o \
$(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o $(O)mhsplash.o \ $(O)mhmenu.o $(O)mhmsgwnd.o $(O)mhrip.o $(O)mhsplash.o \
$(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)winhack.o $(O)mhstatus.o $(O)mhtext.o $(O)mswproc.o $(O)NetHackW.o
endif endif
@@ -475,10 +482,18 @@ endif
#========================================== #==========================================
#========================================== #==========================================
ifndef TRAVIS_COMPILER
cc = i686-w64-mingw32-gcc.exe cc = i686-w64-mingw32-gcc.exe
cxx = g++ cxx = g++
rc = windres rc = windres
link = i686-w64-mingw32-gcc.exe link = i686-w64-mingw32-gcc.exe
else
cc = gcc
cxx = g++
rc = windres
link = gcc
endif
ifeq "$(WANT_WIN_QT4)" "Y" ifeq "$(WANT_WIN_QT4)" "Y"
link = g++ link = g++
endif endif
@@ -547,7 +562,7 @@ lflags = $(LFLAGSBASEC) $(linkdebuf)
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
ifeq "$(USE_DLB)" "Y" ifeq "$(USE_DLB)" "Y"
DLB = nhdat DLB = nhdat$(NHV)
else else
DLB = DLB =
endif endif
@@ -620,11 +635,11 @@ $(OBJ)/%.o : $(MSWIN)/%.c
$(cc) $(CFLAGS) -o$@ $< $(cc) $(CFLAGS) -o$@ $<
#========================================== #==========================================
# Rules for files in win\curses # Rules for files in win/curses
#========================================== #==========================================
$(OBJ)/%.o : $(WCURSES)/%.c $(OBJ)/%.o : $(WCURSES)/%.c
$(cc) $(PDCINCL) $(CFLAGS) -o$@ $< $(cc) -DPDC_NCMOUSE $(PDCINCL) $(CFLAGS) -o$@ $<
#========================================== #==========================================
# Rules for files in PDCurses # Rules for files in PDCurses
@@ -728,16 +743,20 @@ default : install
all : install all : install
install: initialchk $(GAMEDIR)/NetHack.exe $(U)uudecode.exe $(O)winres.o \ install: initialchk $(O)utility.tag $(GAMEDIR)/NetHack.exe $(NETHACKW_EXE) \
$(NETHACKW_EXE) install.tag $(EXTRA_FILES) $(O)install.tag $(EXTRA_FILES)
@echo NetHack is up to date. @echo NetHack is up to date.
@echo Done. @echo Done.
$(O)install.tag: $(DAT)/data $(DAT)/rumors $(DAT)/dungeon \
install.tag: $(DAT)/data $(DAT)/rumors $(DAT)/dungeon \ $(DAT)/oracles $(DAT)/quest.dat $(O)sp_lev.tag $(DLB)
$(DAT)/oracles $(DAT)/quest.dat sp_lev.tag $(DLB) ifdef TRAVIS_COMPILER
ls -l $(SRC)
ls -l $(DAT)
ls -l $(UTIL)
endif
ifeq "$(USE_DLB)" "Y" ifeq "$(USE_DLB)" "Y"
$(subst /,\,copy nhdat $(GAMEDIR)) $(subst /,\,copy nhdat$(NHV) $(GAMEDIR))
$(subst /,\,copy $(DAT)/license $(GAMEDIR)) $(subst /,\,copy $(DAT)/license $(GAMEDIR))
$(subst /,\,copy $(DAT)/opthelp $(GAMEDIR)) $(subst /,\,copy $(DAT)/opthelp $(GAMEDIR))
else else
@@ -762,7 +781,7 @@ recover: $(U)recover.exe
$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)) $(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR))
$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt) $(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)/recover.txt)
sp_lev.tag: utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \ $(O)sp_lev.tag: $(O)utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \
$(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des \ $(DAT)/endgame.des $(DAT)/gehennom.des $(DAT)/knox.des \
$(DAT)/medusa.des $(DAT)/oracle.des $(DAT)/tower.des \ $(DAT)/medusa.des $(DAT)/oracle.des $(DAT)/tower.des \
$(DAT)/yendor.des $(DAT)/arch.des $(DAT)/barb.des \ $(DAT)/yendor.des $(DAT)/arch.des $(DAT)/barb.des \
@@ -796,9 +815,9 @@ sp_lev.tag: utility.tag $(DAT)/bigroom.des $(DAT)/castle.des \
$(subst /,\,$(U)levcomp $(DAT)/wizard.des) $(subst /,\,$(U)levcomp $(DAT)/wizard.des)
$(subst /,\,copy *.lev $(DAT)) $(subst /,\,copy *.lev $(DAT))
$(subst /,\,del *.lev) $(subst /,\,del *.lev)
$(subst /,\,echo sp_levs done > sp_lev.tag) $(subst /,\,echo sp_levs done > $(O)sp_lev.tag)
utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \ $(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
$(SRC)/vis_tab.c $(U)levcomp.exe $(INCL)/vis_tab.h \ $(SRC)/vis_tab.c $(U)levcomp.exe $(INCL)/vis_tab.h \
$(U)dgncomp.exe $(TILEUTIL16) $(U)dgncomp.exe $(TILEUTIL16)
$(subst /,\,@echo utilities made >$@) $(subst /,\,@echo utilities made >$@)
@@ -807,11 +826,11 @@ utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe
@echo Optional tile development utilities are up to date. @echo Optional tile development utilities are up to date.
$(O)winres.o: $(TILEBMP16) $(MSWIN)/winhack.rc $(MSWIN)/mnsel.bmp \ $(O)winres.o: $(TILEBMP16) $(MSWIN)/NetHackW.rc $(MSWIN)/mnsel.bmp \
$(MSWIN)/mnselcnt.bmp $(MSWIN)/mnunsel.bmp \ $(MSWIN)/mnselcnt.bmp $(MSWIN)/mnunsel.bmp \
$(MSWIN)/petmark.bmp $(MSWIN)/pilemark.bmp $(MSWIN)/NetHack.ico $(MSWIN)/rip.bmp \ $(MSWIN)/petmark.bmp $(MSWIN)/pilemark.bmp $(MSWIN)/NetHack.ico $(MSWIN)/rip.bmp \
$(MSWIN)/splash.bmp $(MSWIN)/splash.bmp
$(rc) -o$@ --include-dir $(MSWIN) -i $(MSWIN)/winhack.rc $(rc) -o$@ --include-dir $(MSWIN) -i $(MSWIN)/NetHackW.rc
$(O)conres.o: $(MSWSYS)/console.rc $(MSWSYS)/NetHack.ico $(O)conres.o: $(MSWSYS)/console.rc $(MSWSYS)/NetHack.ico
$(rc) -o$@ --include-dir $(MSWSYS) -i $(MSWSYS)/console.rc $(rc) -o$@ --include-dir $(MSWSYS) -i $(MSWSYS)/console.rc
@@ -830,7 +849,7 @@ $(GAMEDIR)/NetHack.exe : gamedir.tag $(PDCLIB) $(O)tile.o $(O)nttty.o $(O)guistu
@echo Linking $@... @echo Linking $@...
$(link) $(lflags) -o$@ $(ALLOBJ) $(TTYOBJ) $(O)nttty.o $(O)tile.o \ $(link) $(lflags) -o$@ $(ALLOBJ) $(TTYOBJ) $(O)nttty.o $(O)tile.o \
$(O)guistub.o $(O)conres.o $(PDCLIB) $(conlibs) -static -lstdc++ $(O)guistub.o $(O)conres.o $(PDCLIB) $(conlibs) -static -lstdc++
$(subst /,\,@if exist install.tag del install.tag) $(subst /,\,@if exist $(O)install.tag del $(O)install.tag)
# NetHackW # NetHackW
# full tty linkage libs: # full tty linkage libs:
@@ -846,7 +865,7 @@ $(GAMEDIR)/NetHackW.exe : gamedir.tag $(PDCLIB) $(O)tile.o $(O)ttystub.o \
@echo Linking $@... @echo Linking $@...
$(link) $(lflags) -mwindows -o$@ $(ALLOBJ) $(GUIOBJ) $(O)tile.o $(O)ttystub.o \ $(link) $(lflags) -mwindows -o$@ $(ALLOBJ) $(GUIOBJ) $(O)tile.o $(O)ttystub.o \
$(O)winres.o $(PDCLIB) $(guilibs) -static -lstdc++ $(O)winres.o $(PDCLIB) $(guilibs) -static -lstdc++
$(subst /,\,@if exist install.tag del install.tag) $(subst /,\,@if exist $(O)install.tag del $(O)install.tag)
endif endif
$(O)nhdefkey.o: $(O)nhdefkey.o:
@@ -926,16 +945,16 @@ $(INCL)/vis_tab.h: $(U)makedefs.exe
$(SRC)/vis_tab.c: $(U)makedefs.exe $(SRC)/vis_tab.c: $(U)makedefs.exe
$(subst /,\,$(U)makedefs -z) $(subst /,\,$(U)makedefs -z)
$(DAT)/data: utility.tag $(DATABASE) $(DAT)/data: $(O)utility.tag $(DATABASE)
$(subst /,\,$(U)makedefs -d) $(subst /,\,$(U)makedefs -d)
$(DAT)/rumors: utility.tag $(DAT)/rumors.tru $(DAT)/rumors.fal $(DAT)/rumors: $(O)utility.tag $(DAT)/rumors.tru $(DAT)/rumors.fal
$(subst /,\,$(U)makedefs -r) $(subst /,\,$(U)makedefs -r)
$(DAT)/quest.dat: utility.tag $(DAT)/quest.txt $(DAT)/quest.dat: $(O)utility.tag $(DAT)/quest.txt
$(subst /,\,$(U)makedefs -q) $(subst /,\,$(U)makedefs -q)
$(DAT)/oracles: utility.tag $(DAT)/oracles.txt $(DAT)/oracles: $(O)utility.tag $(DAT)/oracles.txt
$(subst /,\,$(U)makedefs -h) $(subst /,\,$(U)makedefs -h)
$(DAT)/engrave: $(DAT)/engrave.txt $(U)makedefs.exe $(DAT)/engrave: $(DAT)/engrave.txt $(U)makedefs.exe
@@ -947,7 +966,7 @@ $(DAT)/epitaph: $(DAT)/epitaph.txt $(U)makedefs.exe
$(DAT)/bogusmon: $(DAT)/bogusmon.txt $(U)makedefs.exe $(DAT)/bogusmon: $(DAT)/bogusmon.txt $(U)makedefs.exe
$(subst /,\,$(U)makedefs -s) $(subst /,\,$(U)makedefs -s)
$(DAT)/dungeon: utility.tag $(DAT)/dungeon.def $(DAT)/dungeon: $(O)utility.tag $(DAT)/dungeon.def
$(subst /,\,$(U)makedefs -e) $(subst /,\,$(U)makedefs -e)
$(subst /,\,$(U)dgncomp $(DAT)/dungeon.pdf) $(subst /,\,$(U)dgncomp $(DAT)/dungeon.pdf)
@@ -1099,10 +1118,11 @@ $(O)dlb_main.o: $(UTIL)/dlb_main.c $(INCL)/config.h $(INCL)/dlb.h
$(DAT)/porthelp: $(MSWSYS)/porthelp $(DAT)/porthelp: $(MSWSYS)/porthelp
$(subst /,\,@copy $(MSWSYS)/porthelp $@ >nul) $(subst /,\,@copy $(MSWSYS)/porthelp $@ >nul)
nhdat: $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \ nhdat$(NHV): $(U)dlb_main.exe $(DAT)/data $(DAT)/oracles $(OPTIONS_FILE) \
$(DAT)/quest.dat $(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp $(DAT)/keyhelp \ $(DAT)/quest.dat $(DAT)/rumors $(DAT)/help $(DAT)/hh $(DAT)/cmdhelp $(DAT)/keyhelp \
$(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp $(DAT)/dungeon \ $(DAT)/history $(DAT)/opthelp $(DAT)/wizhelp $(DAT)/dungeon \
$(DAT)/porthelp $(DAT)/license $(DAT)/engrave $(DAT)/epitaph $(DAT)/bogusmon $(DAT)/tribute sp_lev.tag $(DAT)/porthelp $(DAT)/license $(DAT)/engrave \
$(DAT)/epitaph $(DAT)/bogusmon $(DAT)/tribute $(O)sp_lev.tag
$(subst /,\,echo data >$(DAT)/dlb.lst) $(subst /,\,echo data >$(DAT)/dlb.lst)
$(subst /,\,echo oracles >>$(DAT)/dlb.lst) $(subst /,\,echo oracles >>$(DAT)/dlb.lst)
$(subst /,\,if exist $(DAT)/options echo options >>$(DAT)/dlb.lst) $(subst /,\,if exist $(DAT)/options echo options >>$(DAT)/dlb.lst)
@@ -1235,13 +1255,13 @@ ifneq "$(W_GAMEDIR)" ""
if exist $(W_GAMEDIR)\nhraykey.dll del $(W_GAMEDIR)\nhraykey.dll if exist $(W_GAMEDIR)\nhraykey.dll del $(W_GAMEDIR)\nhraykey.dll
if exist $(W_GAMEDIR)\NetHack.exe del $(W_GAMEDIR)\NetHack.exe if exist $(W_GAMEDIR)\NetHack.exe del $(W_GAMEDIR)\NetHack.exe
if exist $(W_GAMEDIR)\NetHack.pdb del $(W_GAMEDIR)\NetHack.pdb if exist $(W_GAMEDIR)\NetHack.pdb del $(W_GAMEDIR)\NetHack.pdb
if exist $(W_GAMEDIR)\nhdat del $(W_GAMEDIR)\nhdat if exist $(W_GAMEDIR)\nhdat$(NHV) del $(W_GAMEDIR)\nhdat$(NHV)
endif endif
ifneq "$(W_SRC)" "" ifneq "$(W_SRC)" ""
if exist $(W_SRC)\vis_tab.c del $(W_SRC)\vis_tab.c if exist $(W_SRC)\vis_tab.c del $(W_SRC)\vis_tab.c
if exist $(W_SRC)\tile.c del $(W_SRC)\tile.c if exist $(W_SRC)\tile.c del $(W_SRC)\tile.c
if exist $(W_SRC)\vis_tab.c del $(W_SRC)\vis_tab.c if exist $(W_SRC)\vis_tab.c del $(W_SRC)\vis_tab.c
if exist nhdat. del nhdat. if exist $(W_SRC)\nhdat$(NHV). del $(W_SRC)\nhdat$(NHV).
endif endif
ifneq "$(W_DAT)" "" ifneq "$(W_DAT)" ""
if exist $(W_DAT)\data del $(W_DAT)\data if exist $(W_DAT)\data del $(W_DAT)\data
@@ -1334,8 +1354,8 @@ endif
clean: clean:
if exist initialchk del initialchk if exist initialchk del initialchk
if exist install.tag del install.tag if exist $(O)install.tag del $(O)install.tag
if exist utility.tag del utility.tag if exist $(O)utility.tag del $(O)utility.tag
ifneq "$(W_UTIL)" "" ifneq "$(W_UTIL)" ""
if exist $(W_UTIL)\makedefs.exe del $(W_UTIL)\makedefs.exe if exist $(W_UTIL)\makedefs.exe del $(W_UTIL)\makedefs.exe
if exist $(W_UTIL)\levcomp.exe del $(W_UTIL)\levcomp.exe if exist $(W_UTIL)\levcomp.exe del $(W_UTIL)\levcomp.exe
@@ -1392,8 +1412,8 @@ endif
$(subst /,\,if exist $(TILEBMP32) del $(TILEBMP32)) $(subst /,\,if exist $(TILEBMP32) del $(TILEBMP32))
#clean: #clean:
# -test -f install.tag && del install.tag # -test -f $(O)install.tag && del $(O)install.tag
# -test -f utility.tag && del utility.tag # -test -f $(O)utility.tag && del $(O)utility.tag
# -test -f $(U)makedefs.exe && del $(U)makedefs.exe # -test -f $(U)makedefs.exe && del $(U)makedefs.exe
# -test -f $(U)levcomp.exe && del $(U)levcomp.exe # -test -f $(U)levcomp.exe && del $(U)levcomp.exe
# -test -f $(U)dgncomp.exe && del $(U)dgncomp.exe # -test -f $(U)dgncomp.exe && del $(U)dgncomp.exe
sys/winnt/Makefile.msc
+5 -6
View File
@@ -72,8 +72,8 @@ DEBUGINFO = Y
# PDCurses header (.h) files and PDCURSES_C to the location # PDCurses header (.h) files and PDCURSES_C to the location
# of your PDCurses C files. # of your PDCurses C files.
# #
#ADD_CURSES=Y ADD_CURSES=Y
#PDCURSES_TOP=..\..\pdcurses PDCURSES_TOP=..\..\pdcurses
# #
#============================================================================== #==============================================================================
# This marks the end of the BUILD DECISIONS section. # This marks the end of the BUILD DECISIONS section.
@@ -365,6 +365,7 @@ DATABASE = $(DAT)\data.base
#========================================== #==========================================
cc=cl cc=cl
cpp=cpp
link=link link=link
rc=Rc rc=Rc
@@ -582,7 +583,7 @@ DLB =
@$(cc) $(cflagsBuild) -Fo$@ $< @$(cc) $(cflagsBuild) -Fo$@ $<
{$(SSYS)}.cpp{$(OBJ)}.o: {$(SSYS)}.cpp{$(OBJ)}.o:
@$(CC) $(cflagsBuild) /EHsc -Fo$@ $< @$(cc) $(cflagsBuild) /EHsc -Fo$@ $<
#========================================== #==========================================
# Rules for files in sys\winnt # Rules for files in sys\winnt
@@ -634,8 +635,7 @@ DLB =
#========================================== #==========================================
{$(WCURSES)}.c{$(OBJ)}.o: {$(WCURSES)}.c{$(OBJ)}.o:
@$(cc) -DPDC_NCMOUSE -DCURSES_DEFINE_ERASE_CHAR \ @$(cc) -DPDC_NCMOUSE $(PDCINCL) $(cflagsBuild) -Fo$@ $<
$(PDCINCL) $(cflagsBuild) -Fo$@ $<
#{$(WCURSES)}.txt{$(DAT)}.txt: #{$(WCURSES)}.txt{$(DAT)}.txt:
# @copy $< $@ # @copy $< $@
@@ -838,7 +838,6 @@ $(GAMEDIR)\NetHackW.exe : $(O)gamedir.tag $(O)tile.o $(O)ttystub.o \
$(O)ttystub.o $(O)ttystub.o
$(O)NetHackW.res $(O)NetHackW.res
<< <<
@if exist $(O)install.tag del $(O)install.tag
$(O)gamedir.tag: $(O)gamedir.tag:
@if not exist $(GAMEDIR)\*.* echo creating directory $(GAMEDIR:\=/) @if not exist $(GAMEDIR)\*.* echo creating directory $(GAMEDIR:\=/)
sys/winnt/stubs.c
+3
View File
@@ -64,6 +64,9 @@ HANDLE hConIn;
HANDLE hConOut; HANDLE hConOut;
int GUILaunched; int GUILaunched;
struct window_procs tty_procs = { "-ttystubs" }; struct window_procs tty_procs = { "-ttystubs" };
#ifdef CURSES_GRAPHICS
char erase_char, kill_char;
#endif
void void
win_tty_init(dir) win_tty_init(dir)