vcproj: Fixes and cleanup

Fixed an issue caused by 659b9a4 - the 'Start Debugging' option was basically useless as the process terminates itself if OMP_WAIT_POLICY isn't defined. Cleaned up unnecessary configurations for WindowsTimeout. Fixed duplicate manifest. Disabled WML unit tests on MSVC Debug builds as they would quintuple build duration (over 60s per test). Re-enabled stdout redirection in WML_tests.cmd to avoid spamming the command line. Updated vcproj for daa2140 (added multimenu widget).
wesnoth · Jul 26, 2015 · d279aa4 · d279aa4
1 parent cbd024f
commit d279aa4
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 163 deletions.
diff --git a/packaging/windows/wesnoth.rc b/packaging/windows/wesnoth.rc
@@ -1,7 +1,9 @@
 #include "windows.h"
 #include "../../src/wesconfig.h"
 
+#ifndef _MSC_VER
 CREATEPROCESS_MANIFEST_RESOURCE_ID	RT_MANIFEST	"wesnoth.exe.manifest"
+#endif
 WESNOTH_ICON						ICON		"wesnoth-icon.ico"
 
 VS_VERSION_INFO	VERSIONINFO

diff --git a/projectfiles/VC9/WML_tests.cmd b/projectfiles/VC9/WML_tests.cmd
@@ -6,7 +6,6 @@ setlocal enabledelayedexpansion
 
 :: if OMP_WAIT_POLICY isn't set, the process restarts itself and !ERRORLEVEL!=0
 set OMP_WAIT_POLICY=PASSIVE
-set SDL_STDIO_REDIRECT=0
 
 :: save file paths and command line arguments
 cd ..\..\

diff --git a/projectfiles/VC9/WindowsTimeout.vcproj b/projectfiles/VC9/WindowsTimeout.vcproj
@@ -44,7 +44,6 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4127;4512"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -155,144 +154,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug_with_VLD|Win32"
-			OutputDirectory="$(SolutionDir)\..\.."
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="4"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4127;4512"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-				LinkTimeCodeGeneration="1"
-				OutputFile="$(OutDir)\WindowsTimeout.exe"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDEBUG|Win32"
-			OutputDirectory="$(SolutionDir)\..\.."
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-				LinkIncremental="2"
-				OutputFile="$(OutDir)\WindowsTimeout.exe"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>

diff --git a/projectfiles/VC9/wesnoth.sln b/projectfiles/VC9/wesnoth.sln
@@ -67,14 +67,14 @@ Global
 		{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Release|Win32.ActiveCfg = Release|Win32
 		{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.ReleaseDEBUG|Win32.ActiveCfg = ReleaseDEBUG|Win32
-		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Debug_with_VLD|Win32.ActiveCfg = Debug_with_VLD|Win32
-		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Debug_with_VLD|Win32.Build.0 = Debug_with_VLD|Win32
+		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Debug_with_VLD|Win32.ActiveCfg = Debug|Win32
+		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Debug_with_VLD|Win32.Build.0 = Debug|Win32
 		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Debug|Win32.Build.0 = Debug|Win32
 		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Release|Win32.ActiveCfg = Release|Win32
 		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.Release|Win32.Build.0 = Release|Win32
-		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.ReleaseDEBUG|Win32.ActiveCfg = ReleaseDEBUG|Win32
-		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.ReleaseDEBUG|Win32.Build.0 = ReleaseDEBUG|Win32
+		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.ReleaseDEBUG|Win32.ActiveCfg = Debug|Win32
+		{06CDDAD5-8638-46F0-88F5-1B458B7FBE0C}.ReleaseDEBUG|Win32.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_MSC_VER"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -93,11 +94,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="WML unit tests for Wesnoth"
-				CommandLine="WML_tests.cmd $(OutDir)"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -145,6 +141,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_MSC_VER"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -234,6 +231,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_MSC_VER"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -266,11 +264,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="WML unit tests for Wesnoth"
-				CommandLine="WML_tests.cmd $(OutDir)"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Test_Debug|Win32"
@@ -316,6 +309,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_MSC_VER"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -349,11 +343,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="WML unit tests for Wesnoth"
-				CommandLine="WML_tests.cmd $(OutDir)"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Test_Release|Win32"
@@ -401,6 +390,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_MSC_VER"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -493,6 +483,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_MSC_VER"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -16843,6 +16834,62 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\widgets\multimenu.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\Widgets\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\Widgets\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_with_VLD|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\Widgets\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Test_Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\Widgets\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Test_Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\Widgets\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseDEBUG|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\Widgets\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\widgets\multimenu.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\widgets\progressbar.cpp"
 				>

diff --git a/projectfiles/VC9/wesnoth.vcproj.user b/projectfiles/VC9/wesnoth.vcproj.user
@@ -9,21 +9,32 @@
 			Name="Debug|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="..\.."
+				WorkingDirectory="$(SolutionDir)..\..\"
+				Environment="OMP_WAIT_POLICY=PASSIVE"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="..\.."
+				WorkingDirectory="$(SolutionDir)..\..\"
+				Environment="OMP_WAIT_POLICY=PASSIVE"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug (fast)|Win32"
+			Name="Debug_with_VLD|Win32"
 			>
 			<DebugSettings
-				WorkingDirectory="..\.."
+				WorkingDirectory="$(SolutionDir)..\..\"
+				Environment="OMP_WAIT_POLICY=PASSIVE"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseDEBUG|Win32"
+			>
+			<DebugSettings
+				WorkingDirectory="$(SolutionDir)..\..\"
+				Environment="OMP_WAIT_POLICY=PASSIVE"
 			/>
 		</Configuration>
 	</Configurations>