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

pass NETHACK_VERSION to package subproject

Browse Source
This commit is contained in:
nhmall
2024-04-01 09:24:09 -04:00
parent 9ba045b264
commit 459f5f77c1
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/windows/vs/NetHackProperties.props
+4 -3
View File
@@ -5,9 +5,10 @@
<VERSION_MAJOR>3</VERSION_MAJOR> <VERSION_MAJOR>3</VERSION_MAJOR>
<VERSION_MINOR>7</VERSION_MINOR> <VERSION_MINOR>7</VERSION_MINOR>
<PATCHLEVEL>0</PATCHLEVEL> <PATCHLEVEL>0</PATCHLEVEL>
<LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION> <NETHACK_VERSION>$(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL)</NETHACK_VERSION>
<LUA_MINOR_VERSION>4</LUA_MINOR_VERSION> <LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
<LUA_PATCH_LEVEL>6></LUA_PATCH_LEVEL> <LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
<LUA_PATCH_LEVEL>6></LUA_PATCH_LEVEL>
<LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION> <LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
<FMODROOT>$(ROOTDIR)lib\fmod\api\core\</FMODROOT> <FMODROOT>$(ROOTDIR)lib\fmod\api\core\</FMODROOT>
<FMODLIBBASENAME>fmod_vc.lib</FMODLIBBASENAME> <FMODLIBBASENAME>fmod_vc.lib</FMODLIBBASENAME>
sys/windows/vs/package/package.nmake
+6
View File
@@ -2,7 +2,13 @@
#============================================================================== #==============================================================================
# #
# The version of the game this Makefile was designed for # The version of the game this Makefile was designed for
!IFNDEF NETHACK_VERSION
NETHACK_VERSION="3.7.0" NETHACK_VERSION="3.7.0"
!MESSAGE NETHACK_VERSION set to $(NETHACK_VERSION).
!ELSE
!MESSAGE NETHACK_VERSION set to $(NETHACK_VERSION) by caller.
!ENDIF
# A brief variation for use in macros # A brief variation for use in macros
NHV=$(NETHACK_VERSION:.=) NHV=$(NETHACK_VERSION:.=)
sys/windows/vs/package/package.vcxproj
+2 -1
View File
@@ -20,6 +20,7 @@
</ItemGroup> </ItemGroup>
<Import Project="..\config.props" /> <Import Project="..\config.props" />
<Import Project="..\dirs.props" /> <Import Project="..\dirs.props" />
<Import Project="..\NetHackProperties.props" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion> <VCProjectVersion>17.0</VCProjectVersion>
<ProjectGuid>{0B53AF9B-E1A4-478B-9246-43A39E8B4027}</ProjectGuid> <ProjectGuid>{0B53AF9B-E1A4-478B-9246-43A39E8B4027}</ProjectGuid>
@@ -53,7 +54,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake BinDir=&quot;$(BinDir)\&quot; Platform=&quot;$(Platform)&quot; PlatformShortName=&quot;$(PlatformShortName)&quot; Configuration=&quot;$(Configuration)&quot; %26%26 popd</NMakeBuildCommandLine> <NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake BinDir=&quot;$(BinDir)\&quot; Platform=&quot;$(Platform)&quot; PlatformShortName=&quot;$(PlatformShortName)&quot; Configuration=&quot;$(Configuration)&quot; NETHACK_VERSION=&quot;$(NETHACK_VERSION)&quot; %26%26 popd</NMakeBuildCommandLine>
<NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake clean %26%26 popd</NMakeCleanCommandLine> <NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake clean %26%26 popd</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
</PropertyGroup> </PropertyGroup>