diff --git a/sys/windows/vs/FetchPrereq/fetchprereq.nmake b/sys/windows/vs/FetchPrereq/fetchprereq.nmake index 07c62dbb6..2b826a302 100644 --- a/sys/windows/vs/FetchPrereq/fetchprereq.nmake +++ b/sys/windows/vs/FetchPrereq/fetchprereq.nmake @@ -33,7 +33,7 @@ SUBMDIR=$(ROOTDIR)\$(SUBMSDIR) default: fetchall -fetchall: libdir fetch-Lua fetch-pdcurses ..\..\..\..\include\nhlua.h +fetchall: libdir fetch-Lua fetch-pdcurses fetch-lua: fetch-actual-Lua @@ -56,14 +56,6 @@ fetch-pdcurses: cd ..\sys\windows\vs\fetchprereq @echo $(PDCDIST) has been fetched into $(LIBDIR)\$(PDCDIST) -..\..\..\..\include\nhlua.h: - @echo /* nhlua.h - generated by Makefile from fetchprereq.nmake */ > $@ - @echo #include "lua.h" >> $@ - @echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; >> $@ - @echo #include "lualib.h" >> $@ - @echo #include "lauxlib.h" >> $@ - @echo /*nhlua.h*/ >> $@ - libdir: @if not exist $(LIBDIR)\*.* echo creating directory $(LIB:\=/) @if not exist $(LIBDIR)\*.* mkdir $(LIBDIR) diff --git a/sys/windows/vs/NetHack.sln b/sys/windows/vs/NetHack.sln index 99f79d38d..2c70f0491 100644 --- a/sys/windows/vs/NetHack.sln +++ b/sys/windows/vs/NetHack.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.0.11205.157 d18.0 +VisualStudioVersion = 18.0.11205.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}" ProjectSection(ProjectDependencies) = postProject @@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHac {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42} {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} EndProjectSection EndProject @@ -26,7 +27,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}" ProjectSection(ProjectDependencies) = postProject {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} - {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}" @@ -41,26 +42,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp\tile2b ProjectSection(ProjectDependencies) = postProject {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}" ProjectSection(ProjectDependencies) = postProject {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}" ProjectSection(ProjectDependencies) = postProject - {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}" ProjectSection(ProjectDependencies) = postProject {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3} - {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} {BAA70D0F-3EC7-4D10-91F0-974F1F49308B} = {BAA70D0F-3EC7-4D10-91F0-974F1F49308B} EndProjectSection @@ -83,6 +86,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hacklib", "hacklib\hacklib.vcxproj", "{096FD6BB-256A-4E68-9B09-2ACA7C606FF3}" ProjectSection(ProjectDependencies) = postProject {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} + {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetchprereq", "FetchPrereq\fetchprereq.vcxproj", "{503AE687-C33A-45ED-93AA-83967E176D67}" @@ -98,6 +103,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "package\package. {63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB} {642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42} {93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895} + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} + {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} {BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945} {BAA70D0F-3EC7-4D10-91F0-974F1F49308B} = {BAA70D0F-3EC7-4D10-91F0-974F1F49308B} {CEC5D360-8804-454F-8591-002184C23499} = {CEC5D360-8804-454F-8591-002184C23499} @@ -108,6 +115,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lualib", "lualib\lualib.vcx {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhlua_h", "nhlua_h\nhlua_h.vcxproj", "{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}" + ProjectSection(ProjectDependencies) = postProject + {503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67} + {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 @@ -286,6 +299,18 @@ Global {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}.Release|Win32.Build.0 = Release|Win32 {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}.Release|x64.ActiveCfg = Release|x64 {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}.Release|x64.Build.0 = Release|x64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|ARM64.Build.0 = Debug|ARM64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|Win32.ActiveCfg = Debug|Win32 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|Win32.Build.0 = Debug|Win32 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|x64.ActiveCfg = Debug|x64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|x64.Build.0 = Debug|x64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|ARM64.ActiveCfg = Release|ARM64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|ARM64.Build.0 = Release|ARM64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|Win32.ActiveCfg = Release|Win32 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|Win32.Build.0 = Release|Win32 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|x64.ActiveCfg = Release|x64 + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/sys/windows/vs/dirs.props b/sys/windows/vs/dirs.props index f481482b1..91629701d 100644 --- a/sys/windows/vs/dirs.props +++ b/sys/windows/vs/dirs.props @@ -42,23 +42,30 @@ + $(Platform) ..\ARM64\ + arm64 ..\ARM64\ + arm64 ..\ARM64\ + arm64 ..\x64\ + x64 ..\x64\ + x64 ..\x64\ + x64 diff --git a/sys/windows/vs/hacklib/hacklib.vcxproj b/sys/windows/vs/hacklib/hacklib.vcxproj index a708c1e3a..3c7241496 100644 --- a/sys/windows/vs/hacklib/hacklib.vcxproj +++ b/sys/windows/vs/hacklib/hacklib.vcxproj @@ -75,27 +75,25 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 StaticLibrary false true Unicode - v143 + v145 StaticLibrary false true Unicode - v143 @@ -230,15 +228,6 @@ - - - - - - - - - \ No newline at end of file diff --git a/sys/windows/vs/lualib/lualib.vcxproj b/sys/windows/vs/lualib/lualib.vcxproj index b004fcbfb..227d1618a 100644 --- a/sys/windows/vs/lualib/lualib.vcxproj +++ b/sys/windows/vs/lualib/lualib.vcxproj @@ -40,7 +40,7 @@ - /Gs /Oi- /w44774 /w45262 %(AdditionalOptions) + /Gs /w44774 /w45262 %(AdditionalOptions) 4100;4244;4245;4310;4706;4820;4324 Disabled true @@ -84,45 +84,29 @@ - - StaticLibrary - true - $(DefaultPlatformToolset) - Unicode - - - StaticLibrary - false - $(DefaultPlatformToolset) - true - Unicode - - + StaticLibrary true Unicode + + v143 - - StaticLibrary - true - Unicode + v143 - - StaticLibrary - false - true - Unicode + + v145 + + v143 - - StaticLibrary - false - true - Unicode + v143 + + v145 + @@ -203,7 +187,7 @@ _DEBUG;_LIB;WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;HAS_STDINT_H;HAS_INTTYPES_H;%(PreprocessorDefinitions) true $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) - /Gs /Oi- /w44774 %(AdditionalOptions) + /Gs /w44774 %(AdditionalOptions) @@ -234,12 +218,13 @@ Level3 true - true + false true NDEBUG;_LIB;WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;HAS_STDINT_H;HAS_INTTYPES_H;%(PreprocessorDefinitions) true $(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories) - /Gs /Oi- /w44774 %(AdditionalOptions) + /Gs /w44774 %(AdditionalOptions) + ProgramDatabase @@ -250,15 +235,6 @@ - - - - - - - - - - \ No newline at end of file + diff --git a/sys/windows/vs/nhlua_h/nhlua_h.vcxproj b/sys/windows/vs/nhlua_h/nhlua_h.vcxproj new file mode 100644 index 000000000..842f541d8 --- /dev/null +++ b/sys/windows/vs/nhlua_h/nhlua_h.vcxproj @@ -0,0 +1,59 @@ + + + + + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {A3B1A65E-4B65-4B67-ADF1-0E38567013A5} + 10.0 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sys/windows/vs/package/package.nmake b/sys/windows/vs/package/package.nmake index 55b3e8e02..f1db87c6c 100644 --- a/sys/windows/vs/package/package.nmake +++ b/sys/windows/vs/package/package.nmake @@ -21,37 +21,35 @@ NHV=$(NHV:"=) #LIBSDIR=lib # libraries and external bits #SUBMSDIR=submodules # NetHack git submodules PACKAGESDIR=vspackage # put in vspackage to distinguish -ROOTDIR=..\..\..\.. # root of NetHack tree relative to project file -PlatformFileName=$(lowercase $(PlatformShortName)) +ROOTDIR=..\..\..\..\ # root of NetHack tree relative to project file +PlatformFileName=$(lowercase $(PSN)) # Directories we might have to collect things from # -INCL = $(ROOTDIR)\include # NetHack include files -DAT = $(ROOTDIR)\dat # NetHack data files -DOC = $(ROOTDIR)\doc # NetHack documentation files -UTIL = $(ROOTDIR)\util # Utility source -SRC = $(ROOTDIR)\src # Main source -SSYS = $(ROOTDIR)\sys\share # Shared system files -MSWSYS = $(ROOTDIR)\sys\windows # MS windows specific files -TTY = $(ROOTDIR)\win\tty # window port files (tty) -MSWIN = $(ROOTDIR)\win\win32 # window port files (win32) -WCURSES = $(ROOTDIR)\win\curses # window port files (curses) -WSHR = $(ROOTDIR)\win\share # Tile support files -QT = $(ROOTDIR)\win\Qt # QT support files -X11 = $(ROOTDIR)\win\X11 # X11 support files -LIBDIR = $(ROOTDIR)\lib # libraries and external bits -SUBMDIR = $(ROOTDIR)\submodules # NetHack git submodules -SndWavDir = $(ROOTDIR)\sound\wav # sound files that get integrated -DocDir = $(ROOTDIR)\doc +INCL = $(ROOTDIR)include # NetHack include files +DAT = $(ROOTDIR)dat # NetHack data files +DOC = $(ROOTDIR)doc # NetHack documentation files +UTIL = $(ROOTDIR)util # Utility source +SRC = $(ROOTDIR)src # Main source +SSYS = $(ROOTDIR)sys\share # Shared system files +MSWSYS = $(ROOTDIR)sys\windows # MS windows specific files +TTY = $(ROOTDIR)win\tty # window port files (tty) +MSWIN = $(ROOTDIR)win\win32 # window port files (win32) +WCURSES = $(ROOTDIR)win\curses # window port files (curses) +WSHR = $(ROOTDIR)win\share # Tile support files +QT = $(ROOTDIR)win\Qt # QT support files +X11 = $(ROOTDIR)win\X11 # X11 support files +LIBDIR = $(ROOTDIR)lib # libraries and external bits +SUBMDIR = $(ROOTDIR)submodules # NetHack git submodules +SndWavDir = $(ROOTDIR)sound\wav # sound files that get integrated +DocDir = $(ROOTDIR)doc # Directories we might place collected things # -VSBINDIR=$(ROOTDIR)\vsbinary -VSPACKAGEDIR = $(ROOTDIR)\vspackage +VSBINDIR=$(ROOTDIR)vsbinary +VSPACKAGEDIR = $(ROOTDIR)vspackage - - -default: packageall +default: showvar packageall #=============================================================================== # makefile rules @@ -80,7 +78,7 @@ DBGSYMZIP = $(VSPACKAGEDIR)\nethack-$(NHV)-win-$(PlatformFileName)-debugsymbols. packageall: packagezip -packagezip: showvar vsbindir vspackagedir $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP) +packagezip: vsbindir vspackagedir $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP) @echo NetHack Windows package created: $(MAINZIP) $(MAINZIP): $(FILESTOZIP) @@ -90,34 +88,35 @@ $(MAINZIP): $(FILESTOZIP) $(DBGSYMZIP): $(PDBTOZIP) tar -a -cf $(DBGSYMZIP) $(PDBTOZIP) -$(VSBINDIR)\license: $(BinDir)\license - copy /Y $(BinDir)\license $@ -$(VSBINDIR)\Guidebook.txt: $(BinDir)\Guidebook.txt - copy /Y $(DocDir)\Guidebook.txt $@ -$(VSBINDIR)\NetHack.exe: $(BinDir)\NetHack.exe - copy /Y $(BinDir)\NetHack.exe $@ -$(VSBINDIR)\NetHack.txt: $(BinDir)\NetHack.txt - copy /Y $(DocDir)\NetHack.txt $@ -$(VSBINDIR)\NetHackW.exe: $(BinDir)\NetHackW.exe - copy /Y $(BinDir)\NetHackW.exe $@ -$(VSBINDIR)\opthelp: $(BinDir)\opthelp - copy /Y $(BinDir)\opthelp $@ -$(VSBINDIR)\nhdat$(NHV): $(BinDir)\nhdat$(NHV) +$(VSBINDIR)\license: $(BinDir)license + copy /Y $(BinDir)license $@ +$(VSBINDIR)\Guidebook.txt: $(BinDir)Guidebook.txt + copy /Y $(DocDir)Guidebook.txt $@ +$(VSBINDIR)\NetHack.exe: $(BinDir)NetHack.exe + copy /Y $(BinDir)NetHack.exe $@ +$(VSBINDIR)\NetHack.txt: $(BinDir)NetHack.txt + copy /Y $(DocDir)NetHack.txt $@ +$(VSBINDIR)\NetHackW.exe: $(BinDir)NetHackW.exe + copy /Y $(BinDir)NetHackW.exe $@ +$(VSBINDIR)\opthelp: $(BinDir)opthelp + copy /Y $(BinDir)opthelp $@ +$(VSBINDIR)\nhdat$(NHV): $(BinDir)nhdat$(NHV) copy /Y $(BinDir)\nhdat$(NHV) $@ -$(VSBINDIR)\symbols.template: $(BinDir)\symbols.template - copy /Y $(BinDir)\symbols.template $@ -$(VSBINDIR)\nethackrc.template: $(BinDir)\nethackrc.template - copy /Y $(BinDir)\nethackrc.template $@ -$(VSBINDIR)\sysconf.template: $(BinDir)\sysconf.template - copy /Y $(BinDir)\sysconf.template $@ +$(VSBINDIR)\symbols.template: $(BinDir)symbols.template + copy /Y $(BinDir)symbols.template $@ +$(VSBINDIR)\nethackrc.template: $(BinDir)nethackrc.template + copy /Y $(BinDir)nethackrc.template $@ +$(VSBINDIR)\sysconf.template: $(BinDir)sysconf.template + copy /Y $(BinDir)sysconf.template $@ $(VSBINDIR)\record: - -if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)\record. + -if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)record. showvar: @echo BinDir=[$(BinDir)] @echo Platform=[$(Platform)] - @echo PlatformShortName=[$(PlatformShortName)] + @echo PlatformShortName=[$(PSN)] @echo Configuration=[$(Configuration)] + @echo Host=[$(Host)] vspackagedir: @if not exist $(VSPACKAGEDIR)\*.* echo creating directory $(VSPACKAGEDIR:\=/) diff --git a/sys/windows/vs/package/package.vcxproj b/sys/windows/vs/package/package.vcxproj index f0c0c660c..094bdc780 100644 --- a/sys/windows/vs/package/package.vcxproj +++ b/sys/windows/vs/package/package.vcxproj @@ -70,7 +70,7 @@ - pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake BinDir="$(BinDir)\" Platform="$(Platform)" PlatformShortName="$(PlatformShortName)" Configuration="$(Configuration)" NETHACK_VERSION="$(NETHACK_VERSION)" %26%26 popd + 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 pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake clean %26%26 popd pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake rebuild %26%26 popd