Migrated to VS 2019

ladislav-zezula · Oct 7, 2020 · ce0ae9a · ce0ae9a
1 parent 4fc81fb
commit ce0ae9a
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 80 deletions.
diff --git a/StormLib_vs08.vcproj b/StormLib_vs08.vcproj
@@ -80,7 +80,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -209,7 +209,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -274,7 +274,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -336,7 +336,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -399,7 +399,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -461,7 +461,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -524,7 +524,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -588,7 +588,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -653,7 +653,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -717,7 +717,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -782,7 +782,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -844,7 +844,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -907,7 +907,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -969,7 +969,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 		<Configuration
@@ -1032,7 +1032,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(PlatformName) $(ConfigurationName)"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName) vs2008"
 			/>
 		</Configuration>
 	</Configurations>

diff --git a/StormLib_vs08_dll.vcproj b/StormLib_vs08_dll.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -92,6 +92,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
@@ -141,7 +142,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -168,6 +169,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
@@ -214,7 +216,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -243,6 +245,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 		<Configuration
@@ -290,7 +293,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\StormLib.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
+				ModuleDefinitionFile=".\src\DllMain.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -319,6 +322,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="PostBuild.bat $(ProjectName) $(PlatformName) $(ConfigurationName)"
 			/>
 		</Configuration>
 	</Configurations>
@@ -361,7 +365,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath=".\stormlib_dll\DllMain.c"
+				RelativePath=".\src\DllMain.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -396,6 +400,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\src\DllMain.rc"
+				>
+			</File>
 			<File
 				RelativePath=".\src\FileStream.cpp"
 				>
@@ -1660,10 +1668,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\stormlib_dll\StormLib.def"
-				>
-			</File>
 			<Filter
 				Name="adpcm"
 				>
@@ -2649,6 +2653,10 @@
 				</File>
 			</Filter>
 		</Filter>
+		<File
+			RelativePath=".\src\resource.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

diff --git a/StormLib_vs17.bat → StormLib_vs19.bat b/StormLib_vs17.bat → StormLib_vs19.bat
@@ -16,26 +16,26 @@ if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2017\Enterprise\VC\Auxilia
 
 :BUILD_32BIT
 call "%VCVARS_BAT%" x86
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAS|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUS|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAS|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUD|Win32"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAS|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUD|Win32"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUS|Win32"
 call :RestoreEnvVars
 
 :BUILD_64BIT
 call "%VCVARS_BAT%" x64
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugAS|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "DebugUS|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseAS|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUD|x64"
-devenv.com StormLib_vs17.sln /project "StormLib" /rebuild "ReleaseUS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugAS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "DebugUS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseAS|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUD|x64"
+devenv.com StormLib_vs19.sln /project "StormLib" /rebuild "ReleaseUS|x64"
 call :RestoreEnvVars
 
 :RestoreEnvVars

diff --git a/StormLib_vs17.sln → StormLib_vs19.sln b/StormLib_vs17.sln → StormLib_vs19.sln
@@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib_vs17.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib_vs19.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs17_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_vs19_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs17_test.vcxproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_vs19_test.vcxproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution