diff --git a/sys/winnt/nhsetup.bat b/sys/winnt/nhsetup.bat index 22a329629..3cd4e3826 100755 --- a/sys/winnt/nhsetup.bat +++ b/sys/winnt/nhsetup.bat @@ -140,6 +140,16 @@ copy %SRCPATH%\levcomp.vcxproj %BUILDPATH% >nul copy %SRCPATH%\levstuff.vcxproj %BUILDPATH% >nul copy %SRCPATH%\recover.vcxproj %BUILDPATH% >nul copy %SRCPATH%\tiles.vcxproj %BUILDPATH% >nul +echo LIBRARY nhdefkey >%BUILDPATH%\nhdefkey64.def +echo LIBRARY nhdefkey >%BUILDPATH%\nhdefkey.def +echo EXPORTS >>%BUILDPATH%\nhdefkey.def +echo ProcessKeystroke >>%BUILDPATH%\nhdefkey.def +echo NHkbhit >>%BUILDPATH%\nhdefkey.def +echo CheckInput >>%BUILDPATH%\nhdefkey.def +echo SourceWhere >>%BUILDPATH%\nhdefkey.def +echo SourceAuthor >>%BUILDPATH%\nhdefkey.def +echo KeyHandlerName >>%BUILDPATH%\nhdefkey.def + echo Done copying files. :skipvcexpress diff --git a/win/win32/vs2013/NetHack.sln b/win/win32/vs2013/NetHack.sln index 22610b817..48ea6ef93 100644 --- a/win/win32/vs2013/NetHack.sln +++ b/win/win32/vs2013/NetHack.sln @@ -57,6 +57,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "build\NetHack.vc {8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "build\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -167,6 +169,14 @@ Global {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.ActiveCfg = Release|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.Build.0 = Release|Win32 {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.ActiveCfg = Release|Win32 + {6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.ActiveCfg = Debug|Win32 + {6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.Build.0 = Debug|Win32 + {6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.ActiveCfg = Debug|x64 + {6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.Build.0 = Debug|x64 + {6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.ActiveCfg = Release|Win32 + {6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.Build.0 = Release|Win32 + {6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.ActiveCfg = Release|x64 + {6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win/win32/vs2013/NetHack.vcxproj b/win/win32/vs2013/NetHack.vcxproj index 701e2a824..84feac399 100644 --- a/win/win32/vs2013/NetHack.vcxproj +++ b/win/win32/vs2013/NetHack.vcxproj @@ -1,13 +1,21 @@  + + Release + Win32 + + + Release + x64 + Debug Win32 - - Release - Win32 + + Debug + x64 @@ -20,14 +28,26 @@ Application true v120 - Unicode + MultiByte + + + Application + false + MultiByte + v120 Application false v120 true - Unicode + MultiByte + + + Application + false + MultiByte + v120 @@ -39,46 +59,230 @@ - - true + + <_ProjectFileVersion>10.0.30319.1 + .\Release\ + .\Release\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + false + false + .\Debug\ + .\Debug\ + .\Debug\$(ProjectName)\ + .\Debug\$(ProjectName)\ + true + true - - false - - - - - - Level3 - Disabled - WIN32;WIN32CON;DLB;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) - - - Console - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) - - + /Gs /Oi- /FS %(AdditionalOptions) + Disabled Level3 - - + OnlyExplicitInline + Speed + true MaxSpeed true true - WIN32;WIN32CON;DLB;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) + true + MultiThreaded + true + .\Release/NetHack.pch + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + Level3 + true + false Console true true true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies) + true + true + .\Release/NetHack.pdb + true + .\Release/NetHack.map + + + MachineX86 + true + + + Install nethack.exe + copy $(OutDir)NetHack.exe ..\binary +if not exist ..\binary\nhdat copy ..\dat\nhdat ..\binary +if not exist ..\binary\license copy ..\dat\license ..\binary +if not exist ..\binary\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if not exist ..\binary\nethack.txt copy copy ..\doc\nethack.txt ..\binary\NetHack.txt +if not exist ..\binary\defaults.nh copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + + + + + /Gs /Oi- /FS %(AdditionalOptions) + Disabled + Level3 + OnlyExplicitInline + Speed + true + MaxSpeed + true + true + WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) + true + MultiThreaded + true + .\Release/NetHack.pch + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + Level3 + true + false + + + Console + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) + true + true + .\Release/NetHack.pdb + true + .\Release/NetHack.map + + + MachineX86 + + + Install nethack.exe + copy $(OutDir)NetHack.exe ..\binary +if not exist ..\binary\nhdat copy ..\dat\nhdat ..\binary +if not exist ..\binary\license copy ..\dat\license ..\binary +if not exist ..\binary\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if not exist ..\binary\nethack.txt copy copy ..\doc\nethack.txt ..\binary\NetHack.txt +if not exist ..\binary\defaults.nh copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + + + + + + /Gs /Oi- /FS %(AdditionalOptions) + Disabled + OnlyExplicitInline + Speed + true + ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;WIN32CON;DLB;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + true + MultiThreaded + true + .\Debug/NetHack.pch + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + Level3 + true + false + + + .\Release/NetHackW.pdb + true + .\Release/NetHack.map + Console + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Winmm.lib;%(AdditionalDependencies) + MachineX86 + + + Install nethack.exe + copy $(OutDir)NetHack.exe ..\binary +if not exist ..\binary\nhdat copy ..\dat\nhdat ..\binary +if not exist ..\binary\license copy ..\dat\license ..\binary +if not exist ..\binary\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if not exist ..\binary\nethack.txt copy copy ..\doc\nethack.txt ..\binary\NetHack.txt +if not exist ..\binary\defaults.nh copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + + + + + + + /Gs /Oi- /FS %(AdditionalOptions) + Disabled + OnlyExplicitInline + Speed + true + ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) + WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + true + MultiThreaded + true + .\Debug/NetHack.pch + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + Level3 + true + false + + + .\Release/NetHack.pdb + true + .\Release/NetHack.map + Console + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;%(AdditionalDependencies) + /SAFESEH:NO %(AdditionalOptions) + + + Install nethack.exe + copy $(OutDir)NetHack.exe ..\binary +if not exist ..\binary\nhdat copy ..\dat\nhdat ..\binary +if not exist ..\binary\license copy ..\dat\license ..\binary +if not exist ..\binary\Guidebook.txt copy ..\doc\Guidebook.txt ..\binary\Guidebook.txt +if not exist ..\binary\nethack.txt copy copy ..\doc\nethack.txt ..\binary\NetHack.txt +if not exist ..\binary\defaults.nh copy ..\sys\winnt\defaults.nh ..\binary\defaults.nh + + + + + + ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) + WIN32;WIN32CON;DLB;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies) + true + true + true + + + + + ..\win\win32;..\include;..\sys\winnt;..\sys\share;..\win\share;%(AdditionalIncludeDirectories) + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + .\$(ConfigurationName)\$(ProjectName)\ + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies) diff --git a/win/win32/vs2013/nhdefkey.vcxproj b/win/win32/vs2013/nhdefkey.vcxproj new file mode 100644 index 000000000..061f1d854 --- /dev/null +++ b/win/win32/vs2013/nhdefkey.vcxproj @@ -0,0 +1,193 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {6813477F-64B6-4B97-B230-438D0D233385} + Win32Proj + nhdefkey + + + + DynamicLibrary + true + v120 + NotSet + + + DynamicLibrary + true + v120 + NotSet + + + DynamicLibrary + false + v120 + true + NotSet + + + DynamicLibrary + false + v120 + true + NotSet + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + + + Level3 + Disabled + WIN32;WIN32CON;_DEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) + + + Windows + true + $(ProjectDir)..\build\nhdefkey.def + true + true + + + copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary + + + + + + + + + + + Level3 + Disabled + WIN32;WIN32CON;_DEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) + + + Windows + true + $(ProjectDir)..\build\nhdefkey64.def + + + copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary + + + + + + + + + Level3 + + + MaxSpeed + true + true + WIN32;WIN32CON;NDEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + $(ProjectDir)..\build\nhdefkey.def + true + true + + + copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary + + + + + + + + + Level3 + + + MaxSpeed + true + true + WIN32;WIN32CON;NDEBUG;_WINDOWS;_USRDLL;NHDEFKEY_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\include;$(ProjectDir)..\sys\winnt;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + $(ProjectDir)..\build\nhdefkey64.def + + + copy $(TargetPath) ..\binary & if exist $(TargetDir)$(TargetName).PDB copy $(TargetDir)$(TargetName).PDB ..\binary + + + + + + + + + + + + + + + + + + + \ No newline at end of file