[Scummvm-cvs-logs] scummvm-tools master -> 3dcfb7cf716356e2ff5472a125269496a599b3ad

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
3dcfb7cf71 TOOLS: enable inheritance for msvc9 gui + cli


Commit: 3dcfb7cf716356e2ff5472a125269496a599b3ad
    https://github.com/scummvm/scummvm-tools/commit/3dcfb7cf716356e2ff5472a125269496a599b3ad
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-05T02:48:31+01:00

Commit Message:
TOOLS: enable inheritance for msvc9 gui + cli

also disable warnings, that are already disabled in ScummVM

Changed paths:
  A dists/msvc9/ScummVMTools_Global.vsprops
    dists/msvc9/toolscli.vcproj
    dists/msvc9/toolsgui.vcproj



diff --git a/dists/msvc9/ScummVMTools_Global.vsprops b/dists/msvc9/ScummVMTools_Global.vsprops
new file mode 100644
index 0000000..4d784fd
--- /dev/null
+++ b/dists/msvc9/ScummVMTools_Global.vsprops
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVMTools_Global"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="..\.."
+		PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+		DisableSpecificWarnings="4068;4100;4103;4127;4244;4250;4310;4345;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="zlib.lib libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libFLAC_static.lib libpng.lib comctl32.lib Rpcrt4.lib"
+		IgnoreDefaultLibraryNames="MSVCRT;LIBCMT"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/toolscli.vcproj b/dists/msvc9/toolscli.vcproj
index 56ae264..940816f 100644
--- a/dists/msvc9/toolscli.vcproj
+++ b/dists/msvc9/toolscli.vcproj
@@ -21,6 +21,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets=".\ScummVMTools_Global.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -42,7 +43,6 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -61,9 +61,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib libpng.lib libogg_static.lib libvorbis_static.lib libFLAC_static.lib"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBCMT;MSVCRT"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -95,6 +94,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets=".\ScummVMTools_Global.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -136,9 +136,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib libogg_static.lib libvorbis_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBCMT"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/dists/msvc9/toolsgui.vcproj b/dists/msvc9/toolsgui.vcproj
index 6a39df5..8ca2b71 100644
--- a/dists/msvc9/toolsgui.vcproj
+++ b/dists/msvc9/toolsgui.vcproj
@@ -20,6 +20,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets=".\ScummVMTools_Global.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -41,7 +42,6 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -59,8 +59,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
-				IgnoreDefaultLibraryNames="MSVCRT;LIBCMT"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -91,6 +90,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets=".\ScummVMTools_Global.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>