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

Merge branch 'win-novisiontables' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2020-12-29 22:12:59 -05:00
parent a4e7646f4c 1c2c5dae1b
commit 5f486677d0
7 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Porting
View File

@@ -192,7 +192,6 @@ line options to produce several output files that are required for:
util/makedefs -v
util/makedefs -o
util/makedefs -p
util/makedefs -z
util/makedefs -d
util/makedefs -r
util/makedefs -h

17
sys/msdos/Makefile.GCC
View File

@@ -273,7 +273,7 @@ VOBJ16 = $(O)role.o $(O)rumors.o $(O)save.o $(O)sfstruct.o $(O)shk.o
VOBJ17 = $(O)shknam.o $(O)sit.o $(O)sounds.o $(O)sp_lev.o $(O)spell.o
VOBJ18 = $(O)steal.o $(O)steed.o $(O)symbols.o $(O)sys.o $(O)termcap.o
VOBJ19 = $(O)timeout.o $(O)topl.o $(O)topten.o $(O)track.o $(O)trap.o
VOBJ20 = $(O)u_init.o $(O)uhitm.o $(O)vault.o $(O)vision.o $(O)vis_tab.o
VOBJ20 = $(O)u_init.o $(O)uhitm.o $(O)vault.o $(O)vision.o
VOBJ21 = $(O)weapon.o $(O)were.o $(O)wield.o $(O)windows.o $(O)wintty.o
VOBJ22 = $(O)wizard.o $(O)worm.o $(O)worn.o $(O)write.o $(O)zap.o
VOBJ23 = $(O)light.o $(O)dlb.o $(O)dig.o $(O)teleport.o $(O)region.o
@@ -548,7 +548,7 @@ default: $(GAMEFILE)
util: $(O)utility.tag
$(O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/onames.h \
$(INCL)/pm.h vis_tab.c $(TILEUTIL)
$(INCL)/pm.h $(TILEUTIL)
$(subst /,\,echo utilities made > $@)
tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe
@@ -653,12 +653,6 @@ $(INCL)/onames.h: $(U)makedefs.exe
$(INCL)/pm.h: $(U)makedefs.exe
-$(subst /,\,$(U)makedefs -p)
$(INCL)/vis_tab.h: $(U)makedefs.exe
-$(subst /,\,$(U)makedefs -z)
vis_tab.c: $(U)makedefs.exe
-$(subst /,\,$(U)makedefs -z)
#==========================================
# Makedefs Stuff
#==========================================
@@ -913,12 +907,10 @@ spotless: clean
$(subst /,\,if exist $(U)til2bin2.exe del $(U)til2bin2.exe)
$(subst /,\,if exist $(U)thintile.exe del $(U)thintile.exe)
$(subst /,\,if exist $(U)dlb_main.exe del $(U)dlb_main.exe)
$(subst /,\,if exist $(INCL)/vis_tab.h del $(INCL)/vis_tab.h)
$(subst /,\,if exist $(INCL)/onames.h del $(INCL)/onames.h)
$(subst /,\,if exist $(INCL)/pm.h del $(INCL)/pm.h)
$(subst /,\,if exist $(INCL)/date.h del $(INCL)/date.h)
$(subst /,\,if exist $(SRC)/monstr.c del $(SRC)/monstr.c)
$(subst /,\,if exist $(SRC)/vis_tab.c del $(SRC)/vis_tab.c)
$(subst /,\,if exist $(SRC)/tile.c del $(SRC)/tile.c)
$(subst /,\,if exist $(DAT)/options del $(DAT)/options)
$(subst /,\,if exist $(DAT)/data del $(DAT)/data)
@@ -996,11 +988,9 @@ spotless: clean
$(subst /,\,if exist $(U)til2bin2.exe del $(U)til2bin2.exe)
$(subst /,\,if exist $(U)thintile.exe del $(U)thintile.exe)
$(subst /,\,if exist $(U)dlb_main.exe del $(U)dlb_main.exe)
$(subst /,\,if exist $(INCL)/vis_tab.h del $(INCL)/vis_tab.h)
$(subst /,\,if exist $(INCL)/onames.h del $(INCL)/onames.h)
$(subst /,\,if exist $(INCL)/pm.h del $(INCL)/pm.h)
$(subst /,\,if exist $(INCL)/date.h del $(INCL)/date.h)
$(subst /,\,if exist $(SRC)/vis_tab.c del $(SRC)/vis_tab.c)
$(subst /,\,if exist $(SRC)/tile.c del $(SRC)/tile.c)
$(subst /,\,if exist $(DAT)/options del $(DAT)/options)
$(subst /,\,if exist $(DAT)/data del $(DAT)/data)
@@ -1218,7 +1208,6 @@ $(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h
$(O)qttableview.o: ../win/Qt/qttableview.cpp $(INCL)/qttableview.h
$(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qttableview.cpp
$(O)monstr.o: monstr.c $(CONFIG_H)
$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h
$(O)allmain.o: allmain.c $(HACK_H)
$(O)alloc.o: alloc.c $(CONFIG_H)
$(O)apply.o: apply.c $(HACK_H)
@@ -1325,7 +1314,7 @@ $(O)u_init.o: u_init.c $(HACK_H)
$(O)uhitm.o: uhitm.c $(HACK_H)
$(O)vault.o: vault.c $(HACK_H)
$(O)version.o: version.c $(HACK_H) $(INCL)/date.h
$(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h
$(O)vision.o: vision.c $(HACK_H)
$(O)weapon.o: weapon.c $(HACK_H)
$(O)were.o: were.c $(HACK_H)
$(O)wield.o: wield.c $(HACK_H)

21
sys/winnt/Makefile.gcc
View File

@@ -330,9 +330,9 @@ VOBJ22 = $(O)shknam.o $(O)sit.o $(O)sounds.o $(O)sp_lev.o
VOBJ23 = $(O)spell.o $(O)steal.o $(O)steed.o $(O)symbols.o
VOBJ24 = $(O)sys.o $(O)teleport.o $(O)timeout.o $(O)topten.o
VOBJ25 = $(O)track.o $(O)trap.o $(O)u_init.o $(O)uhitm.o
VOBJ26 = $(O)vault.o $(O)vis_tab.o $(O)vision.o $(O)weapon.o
VOBJ27 = $(O)were.o $(O)wield.o $(O)windows.o $(O)wizard.o
VOBJ28 = $(O)worm.o $(O)worn.o $(O)write.o $(O)zap.o
VOBJ26 = $(O)vault.o $(O)vision.o $(O)weapon.o $(O)were.o
VOBJ27 = $(O)wield.o $(O)windows.o $(O)wizard.o $(O)worm.o
VOBJ28 = $(O)worn.o $(O)write.o $(O)zap.o
ifeq "$(ADD_LUA)" "Y"
LUAOBJ = $(O)nhlua.o $(O)nhlsel.o $(O)nhlobj.o
@@ -807,7 +807,7 @@ $(O)sp_lev.tag: $(O)utility.tag
$(subst /,\,echo sp_levs done > $(O)sp_lev.tag)
$(O)utility.tag: $(INCL)/date.h $(INCL)/onames.h $(INCL)/pm.h \
$(SRC)/vis_tab.c $(INCL)/vis_tab.h $(TILEUTIL16)
$(TILEUTIL16)
$(subst /,\,@echo utilities made >$@)
@echo utilities made.
@@ -937,12 +937,6 @@ $(INCL)/onames.h : $(U)makedefs.exe
$(INCL)/pm.h : $(U)makedefs.exe
$(subst /,\,$(U)makedefs -p)
$(INCL)/vis_tab.h: $(U)makedefs.exe
$(subst /,\,$(U)makedefs -z)
$(SRC)/vis_tab.c: $(U)makedefs.exe
$(subst /,\,$(U)makedefs -z)
$(DAT)/data: $(O)utility.tag $(DATABASE)
$(subst /,\,$(U)makedefs -d)
@@ -1212,9 +1206,7 @@ ifneq "$(W_GAMEDIR)" ""
if exist $(W_GAMEDIR)\nhdat$(NHV) del $(W_GAMEDIR)\nhdat$(NHV)
endif
ifneq "$(W_SRC)" ""
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)\vis_tab.c del $(W_SRC)\vis_tab.c
if exist $(W_SRC)\nhdat$(NHV). del $(W_SRC)\nhdat$(NHV).
endif
ifneq "$(W_DAT)" ""
@@ -1265,7 +1257,6 @@ ifneq "$(W_INCL)" ""
if exist $(W_INCL)\date.h del $(W_INCL)\date.h
if exist $(W_INCL)\onames.h del $(W_INCL)\onames.h
if exist $(W_INCL)\pm.h del $(W_INCL)\pm.h
if exist $(W_INCL)\vis_tab.h del $(W_INCL)\vis_tab.h
endif
ifeq "$(ADD_CURSES)" "Y"
ifneq "$(W_OBJ)" ""
@@ -1607,7 +1598,7 @@ $(O)qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_pre.h \
../win/Qt/qt_str.h
# $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp
#---
$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h
$(O)vis_tab.o: vis_tab.c $(CONFIG_H)
$(O)allmain.o: allmain.c $(HACK_H)
$(O)alloc.o: alloc.c $(CONFIG_H)
$(O)apply.o: apply.c $(HACK_H)
@@ -1715,7 +1706,7 @@ $(O)u_init.o: u_init.c $(HACK_H)
$(O)uhitm.o: uhitm.c $(HACK_H)
$(O)vault.o: vault.c $(HACK_H)
$(O)version.o: version.c $(HACK_H) $(INCL)/date.h
$(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h
$(O)vision.o: vision.c $(HACK_H)
$(O)weapon.o: weapon.c $(HACK_H)
$(O)were.o: were.c $(HACK_H)
$(O)wield.o: wield.c $(HACK_H)

20
sys/winnt/Makefile.msc
View File

@@ -315,9 +315,9 @@ VOBJ22 = $(O)sit.o $(O)sounds.o $(O)sp_lev.o $(O)spell.o
VOBJ23 = $(O)steal.o $(O)steed.o $(O)symbols.o $(O)sys.o
VOBJ24 = $(O)teleport.o $(O)timeout.o $(O)topten.o $(O)track.o
VOBJ25 = $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)vault.o
VOBJ26 = $(O)vis_tab.o $(O)vision.o $(O)weapon.o $(O)were.o
VOBJ27 = $(O)wield.o $(O)windows.o $(O)wizard.o $(O)worm.o
VOBJ28 = $(O)worn.o $(O)write.o $(O)zap.o
VOBJ26 = $(O)vision.o $(O)weapon.o $(O)were.o $(O)wield.o
VOBJ27 = $(O)windows.o $(O)wizard.o $(O)worm.o $(O)worn.o
VOBJ28 = $(O)write.o $(O)zap.o
LUAOBJ = $(O)nhlua.o $(O)nhlsel.o $(O)nhlobj.o
@@ -1030,7 +1030,7 @@ $(O)sp_lev.tag:
echo sp_levs done > $(O)sp_lev.tag
$(O)utility.tag: $(INCL)\nhlua.h $(INCL)\date.h $(INCL)\onames.h $(INCL)\pm.h \
$(SRC)\vis_tab.c $(INCL)\vis_tab.h $(TILEUTIL16)
$(TILEUTIL16)
@echo utilities made >$@
@echo utilities made.
@@ -1096,12 +1096,6 @@ $(INCL)\onames.h : $(U)makedefs.exe
$(INCL)\pm.h : $(U)makedefs.exe
$(U)makedefs -p
$(INCL)\vis_tab.h: $(U)makedefs.exe
$(U)makedefs -z
$(SRC)\vis_tab.c: $(U)makedefs.exe
$(U)makedefs -z
#==========================================
# uudecode utility and uuencoded targets
#==========================================
@@ -1630,8 +1624,6 @@ spotless: clean
if exist $(INCL)\date.h del $(INCL)\date.h
if exist $(INCL)\onames.h del $(INCL)\onames.h
if exist $(INCL)\pm.h del $(INCL)\pm.h
if exist $(INCL)\vis_tab.h del $(INCL)\vis_tab.h
if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c
if exist $(SRC)\tile.c del $(SRC)\tile.c
if exist $(U)*.lnk del $(U)*.lnk
if exist $(U)*.map del $(U)*.map
@@ -1643,7 +1635,6 @@ spotless: clean
if exist $(DAT)\dlb.lst del $(DAT)\dlb.lst
if exist $(DAT)\porthelp del $(DAT)\porthelp
if exist $(O)sp_lev.tag del $(O)sp_lev.tag
if exist $(SRC)\vis_tab.c del $(SRC)\vis_tab.c
if exist nhdat$(NHV). del nhdat$(NHV).
if exist $(O)obj.tag del $(O)obj.tag
if exist $(O)gamedir.tag del $(O)gamedir.tag
@@ -1937,7 +1928,6 @@ $(O)wc_chainout.o: ..\win\chain\wc_chainout.c $(HACK_H)
# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_chainout.c
$(O)wc_trace.o: ..\win\chain\wc_trace.c $(HACK_H) $(INCL)\func_tab.h
# @$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_trace.c
$(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)\vis_tab.h
$(O)allmain.o: allmain.c $(HACK_H)
$(O)alloc.o: alloc.c $(CONFIG_H)
$(O)apply.o: apply.c $(HACK_H)
@@ -2055,7 +2045,7 @@ $(O)uhitm.o: uhitm.c $(HACK_H)
$(O)vault.o: vault.c $(HACK_H)
$(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h
@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ version.c
$(O)vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h
$(O)vision.o: vision.c $(HACK_H)
$(O)weapon.o: weapon.c $(HACK_H)
$(O)were.o: were.c $(HACK_H)
$(O)wield.o: wield.c $(HACK_H)

2
win/win32/vs/NetHackW.vcxproj
View File

@@ -190,7 +190,6 @@
<ClCompile Include="$(SrcDir)vault.c" />
<ClCompile Include="$(SrcDir)version.c" />
<ClCompile Include="$(SrcDir)vision.c" />
<ClCompile Include="$(SrcDir)vis_tab.c" />
<ClCompile Include="$(SrcDir)weapon.c" />
<ClCompile Include="$(SrcDir)were.c" />
<ClCompile Include="$(SrcDir)wield.c" />
@@ -313,7 +312,6 @@
<ClInclude Include="$(IncDir)trap.h" />
<ClInclude Include="$(IncDir)unixconf.h" />
<ClInclude Include="$(IncDir)vision.h" />
<ClInclude Include="$(IncDir)vis_tab.h" />
<ClInclude Include="$(IncDir)vmsconf.h" />
<ClInclude Include="$(IncDir)winami.h" />
<ClInclude Include="$(IncDir)wincurs.h" />

1
win/win32/vs/aftermakedefs.proj
View File

@@ -7,7 +7,6 @@
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -v" WorkingDirectory="$(UtilDir)"/>
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -o" WorkingDirectory="$(UtilDir)"/>
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -p" WorkingDirectory="$(UtilDir)"/>
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -z" WorkingDirectory="$(UtilDir)"/>
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -d" WorkingDirectory="$(DatDir)"/>
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -r" WorkingDirectory="$(DatDir)"/>
<Exec Command="&quot;$(ToolsDir)makedefs.exe&quot; -s" WorkingDirectory="$(DatDir)"/>

3
win/win32/vs/files.props
View File

@@ -8,9 +8,6 @@
<Defs Include = "$(IncDir)onames.h"/>
<!-- -p -->
<Defs Include = "$(IncDir)pm.h"/>
<!-- -z -->
<Defs Include = "$(IncDir)vis_tab.h"/>
<Defs Include = "$(SrcDir)vis_tab.c"/>
<!-- -r -->
<Defs Include = "$(DatDir)rumors"/>
<!-- -s -->