From f5bc001e90d1f30736ed5f7f986ec025cbb1514b Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 18 Apr 2009 13:40:52 +0000
Subject: [PATCH] Move more project settings into property sheet files.

Originally committed to SVN as r2829.
---
 .../aegisub_vs2008/aegisub_vs2008.vcproj      | 74 ++-----------------
 .../aegisub_vs2008/compiler_options.vsprops   | 25 +++++++
 .../compiler_options_debug.vsprops            | 25 +++++++
 .../aegisub_vs2008/delayload_ffms2_32.vsprops | 11 +++
 .../aegisub_vs2008/delayload_perl_32.vsprops  | 11 +++
 .../delayload_portaudio_32.vsprops            | 11 +++
 .../svn_rev_header_update.vsprops             | 11 +++
 7 files changed, 99 insertions(+), 69 deletions(-)
 create mode 100644 aegisub/build/aegisub_vs2008/compiler_options.vsprops
 create mode 100644 aegisub/build/aegisub_vs2008/compiler_options_debug.vsprops
 create mode 100644 aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops
 create mode 100644 aegisub/build/aegisub_vs2008/delayload_perl_32.vsprops
 create mode 100644 aegisub/build/aegisub_vs2008/delayload_portaudio_32.vsprops
 create mode 100644 aegisub/build/aegisub_vs2008/svn_rev_header_update.vsprops

diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index dbf76c4f8..579f01ac1 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -21,14 +21,12 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_debug32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops"
+			InheritedPropertySheets=".\suffix_debug32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -45,18 +43,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				OpenMP="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdwx.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267"
 				ForcedIncludeFiles="stdwx.h"
 			/>
@@ -71,13 +61,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				DelayLoadDLLs="perl510.dll;ffms2.dll"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -105,12 +88,11 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_debug64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops"
+			InheritedPropertySheets=".\suffix_debug64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -127,18 +109,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				OpenMP="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdwx.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267"
 				ForcedIncludeFiles="stdwx.h"
 			/>
@@ -153,13 +127,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				DelayLoadDLLs="perl510.dll"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -187,13 +154,12 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops"
+			InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -211,15 +177,9 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="2"
-				OpenMP="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdwx.h"
 				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267"
 				ForcedIncludeFiles="stdwx.h"
 			/>
@@ -234,18 +194,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateManifest="true"
-				DelayLoadDLLs="perl510.dll;ffms2.dll;openal32.dll"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				LargeAddressAware="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
-				Profile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -272,13 +223,12 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops"
+			InheritedPropertySheets=".\suffix_release64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -296,14 +246,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;WIN64;NDEBUG;_WINDOWS"
-				RuntimeLibrary="2"
-				OpenMP="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdwx.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267"
 				ForcedIncludeFiles="stdwx.h"
 			/>
@@ -318,17 +262,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateManifest="true"
-				DelayLoadDLLs="perl510.dll"
-				GenerateDebugInformation="true"
-				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
-				Profile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -523,7 +459,7 @@
 				RelativePath="..\..\src\audio_player_portaudio.h"
 				>
 			</File>
-						<File
+			<File
 				RelativePath="..\..\src\audio_player_portaudio2.cpp"
 				>
 			</File>
diff --git a/aegisub/build/aegisub_vs2008/compiler_options.vsprops b/aegisub/build/aegisub_vs2008/compiler_options.vsprops
new file mode 100644
index 000000000..99bf7cc81
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/compiler_options.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="compiler_options"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		EnableIntrinsicFunctions="true"
+		RuntimeLibrary="2"
+		OpenMP="true"
+		WarningLevel="3"
+		WarnAsError="true"
+		DebugInformationFormat="3"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="1"
+		GenerateManifest="true"
+		GenerateDebugInformation="true"
+		SubSystem="2"
+		LargeAddressAware="2"
+		DataExecutionPrevention="2"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/compiler_options_debug.vsprops b/aegisub/build/aegisub_vs2008/compiler_options_debug.vsprops
new file mode 100644
index 000000000..8db0c4c12
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/compiler_options_debug.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="compiler_options_debug"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		InlineFunctionExpansion="0"
+		EnableIntrinsicFunctions="false"
+		WholeProgramOptimization="false"
+		PreprocessorDefinitions="DEBUG;_DEBUG"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		EnableFunctionLevelLinking="true"
+		DebugInformationFormat="4"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="2"
+		RandomizedBaseAddress="1"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops b/aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops
new file mode 100644
index 000000000..0297308f0
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/delayload_ffms2_32.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="delayload_ffms2_32"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		DelayLoadDLLs="ffms2.dll"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/delayload_perl_32.vsprops b/aegisub/build/aegisub_vs2008/delayload_perl_32.vsprops
new file mode 100644
index 000000000..a3fadc61e
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/delayload_perl_32.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="delayload_perl_32"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		DelayLoadDLLs="perl510.dll"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/delayload_portaudio_32.vsprops b/aegisub/build/aegisub_vs2008/delayload_portaudio_32.vsprops
new file mode 100644
index 000000000..cf4556dda
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/delayload_portaudio_32.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="delayload_portaudio_32"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		DelayLoadDLLs="portaudio_x86.dll"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/svn_rev_header_update.vsprops b/aegisub/build/aegisub_vs2008/svn_rev_header_update.vsprops
new file mode 100644
index 000000000..cb93b5cb6
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/svn_rev_header_update.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="svn_rev_header_update"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+		CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
+	/>
+</VisualStudioPropertySheet>