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

improve copy_bytes() maintenance

Browse Source 
Remove the copy_bytes() function from files.c and util/recover.c
and place a single copy into hacklib.
This commit is contained in:
nhmall
2024-10-05 15:55:20 -04:00
parent 6f8c36df70
commit fb70aadbb5
10 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/msdos/Makefile.GCC
View File

@@ -702,8 +702,8 @@ $(O)hacklibu.o: $(CONFIG_H) $(SRC)/hacklib.c
# Recover Utility
#==========================================
$(U)recover.exe: $(RECOVOBJS)
$(LINK) $(LFLAGS) -o$@ $(O)recover.o
$(U)recover.exe: $(RECOVOBJS) $(HACKLIB)
$(LINK) $(LFLAGS) -o$@ $(O)recover.o $(HACKLIB)
$(O)recover.o: $(CONFIG_H) $(U)recover.c
$(CC) $(cflags) -o$@ $(U)recover.c

2
sys/unix/Makefile.utl
View File

@@ -278,7 +278,7 @@ lintdgn:
# dependencies for recover
#
$(TARGETPFX)recover: $(RECOVOBJS)
$(TARGET_CLINK) $(TARGET_LFLAGS) -o recover $(RECOVOBJS) $(LIBS)
$(TARGET_CLINK) $(TARGET_LFLAGS) -o recover $(RECOVOBJS) $(HACKLIB) $(LIBS)
$(TARGETPFX)recover.o: recover.c $(CONFIG_H)
$(TARGET_CC) $(TARGET_CFLAGS) $(CSTD) -c recover.c -o $@

1
sys/unix/NetHack.xcodeproj/project.pbxproj
View File

@@ -1872,6 +1872,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
059660BE2C80B00400398EDE /* hacklib.c in Sources */,
31B8A45221A26A750055BD01 /* recover.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;

2
sys/windows/Makefile.mingw32
View File

@@ -523,7 +523,7 @@ recover: $(RTARGETS)
$(GAMEDIR)/recover.txt: $(DOC)/recover.txt | $(GAMEDIR)
cp $< $@
$(GAMEDIR)/recover.exe: $(ROBJS) | $(GAMEDIR)
$(GAMEDIR)/recover.exe: $(ROBJS) $(HLHACKLIB) | $(GAMEDIR)
$(ld) $(LDFLAGS) $^ -o$@
$(OR)/recover.o: $(U)recover.c | $(OR)

9
sys/windows/Makefile.nmake
View File

@@ -9,7 +9,7 @@
#
# Visual Studio Compilers Tested:
# - Microsoft Visual Studio 2019 Community Edition v 16.11.38
# - Microsoft Visual Studio 2022 Community Edition v 17.11.2
# - Microsoft Visual Studio 2022 Community Edition v 17.11.4
#
#==============================================================================
# This is used for building two distinct executables of NetHack:
@@ -1538,7 +1538,7 @@ binary.tag: $(DAT)\data $(DAT)\rumors $(DAT)\oracles $(DLB) \
# copy $(MSWSYS)\windsyshlp $(GAMEDIR)
recover: $(U)recover.exe
recover: $(OUTLHACKLIB) $(U)recover.exe
if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)
if exist $(DOC)\recover.txt copy $(DOC)\recover.txt $(GAMEDIR)\recover.txt
@@ -1892,9 +1892,10 @@ nhdat$(NHV): $(U)dlb.exe $(DAT)\data $(DAT)\oracles $(OPTIONS_FILE) $(LUA_FILES)
# Recover Utility
#==========================================
$(U)recover.exe: $(RECOVOBJS)
$(U)recover.exe: $(RECOVOBJS) $(OUTLHACKLIB)
@echo Linking $(@:\=/)
@$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" -out:$@ $(RECOVOBJS)
@$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" \
-out:$@ $(RECOVOBJS) $(OUTLHACKLIB)
$(OUTL)recover.o: $(CONFIG_H) $(U)recover.c $(MSWSYS)\win32api.h
$(Q)$(CC) $(CFLAGS) $(TTYDEF) -Fo$@ $(U)recover.c

6
sys/windows/vs/recover/recover.vcxproj
View File

@@ -21,6 +21,10 @@
<AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;HAS_STDINT_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(ToolsDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>hacklib.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(UtilDir)recover.c" />
@@ -44,4 +48,4 @@
<Target Name="AfterRebuild">
<MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
</Target>
</Project>
</Project>