more Visual Studio vcxproj tweaking

This commit is contained in:
nhmall
2025-11-18 20:03:05 -05:00
parent ec04123a71
commit be10b30914
3 changed files with 30 additions and 29 deletions

View File

@@ -31,6 +31,7 @@
<LuaDir>$(LibDir)lua-$(LUA_VERSION)\src\</LuaDir> <LuaDir>$(LibDir)lua-$(LUA_VERSION)\src\</LuaDir>
<SftagsDir>$(RootDir)\sys\windows\vs\sftags\</SftagsDir> <SftagsDir>$(RootDir)\sys\windows\vs\sftags\</SftagsDir>
<SfctoolDir>$(RootDir)\sys\windows\vs\sfctool\</SfctoolDir> <SfctoolDir>$(RootDir)\sys\windows\vs\sfctool\</SfctoolDir>
<PackageBin>$(RootDir)binary\$(Configuration)\$(Platform)</PackageBin>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(PDCURSESMOD)'=='' AND Exists('$(LibDir)pdcursesmod\curses.h')"> <PropertyGroup Condition="'$(PDCURSESMOD)'=='' AND Exists('$(LibDir)pdcursesmod\curses.h')">
<PDCURSESMOD>$(LibDir)pdcursesmod\</PDCURSESMOD> <PDCURSESMOD>$(LibDir)pdcursesmod\</PDCURSESMOD>

View File

@@ -18,17 +18,17 @@ NHV=$(NHV:"=)
# relative directories from root of NetHack tree. # relative directories from root of NetHack tree.
# #
BACKSLASH=^\ #LIBSDIR=lib # libraries and external bits
#LIBSDIR=lib # libraries and external bits #SUBMSDIR=submodules # NetHack git submodules
#SUBMSDIR=submodules # NetHack git submodules ROOTDIR=..\..\..\..\ # root of NetHack tree relative to project file
PACKAGESDIR=vspackage # put in vspackage to distinguish
ROOTDIR=..\..\..\..$(BACKSLASH) # root of NetHack tree relative to project file
PlatformFileName=$(lowercase $(PSN)) PlatformFileName=$(lowercase $(PSN))
PackageDir=$(PackageBin)
# Directories we might have to collect things from # Directories we might have to collect things from
LIBDIR = $(ROOTDIR)lib$(BACKSLASH) LIBDIR = $(ROOTDIR)lib
# Documentation and text files # Documentation and text files
DocDir = $(ROOTDIR)doc$(BACKSLASH) DocDir = $(ROOTDIR)doc
# binary
# Directories we might place collected things # Directories we might place collected things
# #
@@ -74,31 +74,31 @@ $(MAINZIP): $(FILESTOZIP)
$(DBGSYMZIP): $(PDBTOZIP) $(DBGSYMZIP): $(PDBTOZIP)
tar -a -cf $(DBGSYMZIP) $(PDBTOZIP) tar -a -cf $(DBGSYMZIP) $(PDBTOZIP)
$(VSBINDIR)\license: $(BinDir)license $(VSBINDIR)\license: $(PackageDir)\license
copy /Y $(BinDir)license $@ copy /Y $(PackageDir)\license $@
$(VSBINDIR)\Guidebook.txt: $(DocDir)Guidebook.txt $(VSBINDIR)\Guidebook.txt: $(DocDir)\Guidebook.txt
copy /Y $(DocDir)Guidebook.txt $@ copy /Y $(DocDir)\Guidebook.txt $@
$(VSBINDIR)\NetHack.exe: $(BinDir)NetHack.exe $(VSBINDIR)\NetHack.exe: $(PackageDir)\NetHack.exe
copy /Y $(BinDir)NetHack.exe $@ copy /Y $(PackageDir)\NetHack.exe $@
$(VSBINDIR)\NetHack.txt: $(DocDir)NetHack.txt $(VSBINDIR)\NetHack.txt: $(DocDir)\NetHack.txt
copy /Y $(DocDir)NetHack.txt $@ copy /Y $(DocDir)\NetHack.txt $@
$(VSBINDIR)\NetHackW.exe: $(BinDir)NetHackW.exe $(VSBINDIR)\NetHackW.exe: $(PackageDir)\NetHackW.exe
copy /Y $(BinDir)NetHackW.exe $@ copy /Y $(PackageDir)\NetHackW.exe $@
$(VSBINDIR)\opthelp: $(BinDir)opthelp $(VSBINDIR)\opthelp: $(PackageDir)\opthelp
copy /Y $(BinDir)opthelp $@ copy /Y $(PackageDir)\opthelp $@
$(VSBINDIR)\nhdat$(NHV): $(BinDir)nhdat$(NHV) $(VSBINDIR)\nhdat$(NHV): $(PackageDir)\nhdat$(NHV)
copy /Y $(BinDir)nhdat$(NHV) $@ copy /Y $(PackageDir)\nhdat$(NHV) $@
$(VSBINDIR)\symbols.template: $(BinDir)symbols.template $(VSBINDIR)\symbols.template: $(PackageDir)\symbols.template
copy /Y $(BinDir)symbols.template $@ copy /Y $(PackageDir)\symbols.template $@
$(VSBINDIR)\nethackrc.template: $(BinDir)nethackrc.template $(VSBINDIR)\nethackrc.template: $(PackageDir)\nethackrc.template
copy /Y $(BinDir)nethackrc.template $@ copy /Y $(PackageDir)\nethackrc.template $@
$(VSBINDIR)\sysconf.template: $(BinDir)sysconf.template $(VSBINDIR)\sysconf.template: $(PackageDir)\sysconf.template
copy /Y $(BinDir)sysconf.template $@ copy /Y $(PackageDir)\sysconf.template $@
$(VSBINDIR)\record: $(VSBINDIR)\record:
-if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)record. -if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)record.
showvar: showvar:
@echo BinDir=[$(BinDir)] @echo PackageDir=[$(PackageDir)]
@echo Platform=[$(Platform)] @echo Platform=[$(Platform)]
@echo PlatformShortName=[$(PSN)] @echo PlatformShortName=[$(PSN)]
@echo Configuration=[$(Configuration)] @echo Configuration=[$(Configuration)]

View File

@@ -70,7 +70,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake BinDir="$(BinDir)\" Configuration="$(Configuration)" Platform="$(Platform)" PSN="$(PlatformShortName)" NETHACK_VERSION="$(NETHACK_VERSION)" Host="$(Host)" %26%26 popd</NMakeBuildCommandLine> <NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake PackageBin="$(PackageBin)" Configuration="$(Configuration)" Platform="$(Platform)" PSN="$(PlatformShortName)" NETHACK_VERSION="$(NETHACK_VERSION)" Host="$(Host)" %26%26 popd</NMakeBuildCommandLine>
<NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake clean %26%26 popd</NMakeCleanCommandLine> <NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake clean %26%26 popd</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
</PropertyGroup> </PropertyGroup>