dshowsrcwrapper: upgrade frozen build to vs9

3 files changed, 76 insertions, 97 deletions

diff --git a/win32/vs8/gst-plugins-bad.sln b/win32/vs8/gst-plugins-bad.sln
index 339290a19..d07edf2ae 100755
--- a/win32/vs8/gst-plugins-bad.sln
+++ b/win32/vs8/gst-plugins-bad.sln
@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstdirectdraw", "libgstdirectdraw.vcproj", "{1594A623-5529-4B86-BD4A-694CF0BDB5C4}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstdshowsrcwrapper", "libdshowsrcwrapper.vcproj", "{42EC1484-5031-4962-9E45-C990BB77EB37}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstdirectsound", "libgstdirectsound.vcproj", "{667B0437-F668-443B-AFF0-8991DE75DBED}"

 EndProject

 Global

@@ -16,10 +14,6 @@ Global
 		{1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Debug|Win32.Build.0 = Debug|Win32

 		{1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Release|Win32.ActiveCfg = Release|Win32

 		{1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Release|Win32.Build.0 = Release|Win32

-		{42EC1484-5031-4962-9E45-C990BB77EB37}.Debug|Win32.ActiveCfg = Debug|Win32

-		{42EC1484-5031-4962-9E45-C990BB77EB37}.Debug|Win32.Build.0 = Debug|Win32

-		{42EC1484-5031-4962-9E45-C990BB77EB37}.Release|Win32.ActiveCfg = Release|Win32

-		{42EC1484-5031-4962-9E45-C990BB77EB37}.Release|Win32.Build.0 = Release|Win32

 		{667B0437-F668-443B-AFF0-8991DE75DBED}.Debug|Win32.ActiveCfg = Debug|Win32

 		{667B0437-F668-443B-AFF0-8991DE75DBED}.Debug|Win32.Build.0 = Debug|Win32

 		{667B0437-F668-443B-AFF0-8991DE75DBED}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/win32/vs9/gst-plugins-bad.sln b/win32/vs9/gst-plugins-bad.sln
new file mode 100755
index 000000000..5630cf549
--- /dev/null
+++ b/win32/vs9/gst-plugins-bad.sln
@@ -0,0 +1,20 @@
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstdshowsrcwrapper", "libgstdshowsrcwrapper.vcproj", "{FDA05A8C-7BCF-43A5-992D-FC7323638FF0}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{FDA05A8C-7BCF-43A5-992D-FC7323638FF0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FDA05A8C-7BCF-43A5-992D-FC7323638FF0}.Debug|Win32.Build.0 = Debug|Win32

+		{FDA05A8C-7BCF-43A5-992D-FC7323638FF0}.Release|Win32.ActiveCfg = Release|Win32

+		{FDA05A8C-7BCF-43A5-992D-FC7323638FF0}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/win32/vs8/libdshowsrcwrapper.vcproj b/win32/vs9/libgstdshowsrcwrapper.vcproj
index a87b8603d..6fd27800b 100755
--- a/win32/vs8/libdshowsrcwrapper.vcproj
+++ b/win32/vs9/libgstdshowsrcwrapper.vcproj
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8,00"

+	Version="9,00"

 	Name="libgstdshowsrcwrapper"

-	ProjectGUID="{42EC1484-5031-4962-9E45-C990BB77EB37}"

+	ProjectGUID="{FDA05A8C-7BCF-43A5-992D-FC7323638FF0}"

+	RootNamespace="libgstdshowsrcwrapper"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -14,14 +17,11 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

+			Name="Debug|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="0"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -37,50 +37,35 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/libdshowsrcwrapper.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="C:\msys\1.0\local\include;C:\msys\1.0\local\include\libxml2;&quot;C:\msys\1.0\local\include\glib-2.0&quot;;&quot;C:\msys\1.0\local\lib\glib-2.0\include&quot;;&quot;C:\msys\1.0\local\include\gstreamer-0.10&quot;;..\common;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses&quot;"

-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DSHOWSRCWRAPPER_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/libdshowsrcwrapper.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

+				Optimization="0"

+				AdditionalIncludeDirectories="C:\msys\1.0\local\include;C:\msys\1.0\local\include\libxml2;&quot;C:\msys\1.0\local\include\glib-2.0&quot;;&quot;C:\msys\1.0\local\lib\glib-2.0\include&quot;;&quot;C:\msys\1.0\local\include\gstreamer-0.10&quot;;..\common;&quot;C:\Program Files\Microsoft SDKs\Windows\v6.1\Samples\Multimedia\DirectShow\BaseClasses&quot;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGSTDSHOWSRCWRAPPER_EXPORTS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1036"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstaudio-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib quartz.lib winmm.lib msacm32.lib olepro32.lib Rpcrt4.lib Strmiids.lib strmbase.lib"

-				OutputFile="Release/libgstdshowsrcwrapper.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="C:\msys\1.0\local\lib;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses\XP32_RETAIL&quot;"

-				ModuleDefinitionFile=""

-				ProgramDatabaseFile=".\Release/libgstdshowsrcwrapper.pdb"

-				ImportLibrary=".\Release/libgstdshowsrcwrapper.lib"

+				AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstaudio-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib winmm.lib rpcrt4.lib strmbasd.lib strmiids.lib"

+				LinkIncremental="2"

+				AdditionalLibraryDirectories="C:\msys\1.0\local\lib;&quot;C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib&quot;;&quot;C:\Program Files\Microsoft SDKs\Windows\v6.1\Samples\Multimedia\DirectShow\BaseClasses\Debug_MBCS&quot;"

+				GenerateDebugInformation="true"

+				SubSystem="2"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -94,8 +79,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/libdshowsrcwrapper.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -104,22 +87,17 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="copy /Y Release\libgstdshowsrcwrapper.dll c:\msys\1.0\local\lib\gstreamer-0.10"

+				CommandLine="copy /Y $(OutDir)\$(ProjectName).dll c:\msys\1.0\local\lib\gstreamer-0.10"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

+			Name="Release|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="0"

+			CharacterSet="2"

+			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -135,52 +113,37 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/libdshowsrcwrapper.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="C:\msys\1.0\local\include;C:\msys\1.0\local\include\libxml2;&quot;C:\msys\1.0\local\include\glib-2.0&quot;;&quot;C:\msys\1.0\local\lib\glib-2.0\include&quot;;&quot;C:\msys\1.0\local\include\gstreamer-0.10&quot;;..\common;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses&quot;"

-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;DSHOWSRCWRAPPER_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				EnableEnhancedInstructionSet="2"

-				PrecompiledHeaderFile=".\Debug/libdshowsrcwrapper.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="C:\msys\1.0\local\include;C:\msys\1.0\local\include\libxml2;&quot;C:\msys\1.0\local\include\glib-2.0&quot;;&quot;C:\msys\1.0\local\lib\glib-2.0\include&quot;;&quot;C:\msys\1.0\local\include\gstreamer-0.10&quot;;..\common;&quot;C:\Program Files\Microsoft SDKs\Windows\v6.1\Samples\Multimedia\DirectShow\BaseClasses&quot;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTDSHOWSRCWRAPPER_EXPORTS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1036"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstaudio-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib strmbasd.lib quartz.lib winmm.lib msacm32.lib olepro32.lib Rpcrt4.lib Strmiids.lib"

-				OutputFile="Debug/libgstdshowsrcwrapper.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="C:\msys\1.0\local\lib;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses\XP32_DEBUG&quot;"

-				ModuleDefinitionFile=""

+				AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstaudio-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib winmm.lib rpcrt4.lib strmbase.lib strmiids.lib"

+				LinkIncremental="1"

+				AdditionalLibraryDirectories="C:\msys\1.0\local\lib;&quot;C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib&quot;;&quot;C:\Program Files\Microsoft SDKs\Windows\v6.1\Samples\Multimedia\DirectShow\BaseClasses\Release_MBCS&quot;"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/libgstdshowsrcwrapper.pdb"

-				ImportLibrary=".\Debug/libgstdshowsrcwrapper.lib"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -194,8 +157,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/libdshowsrcwrapper.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -204,11 +165,8 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="copy /Y Debug\libgstdshowsrcwrapper.dll c:\msys\1.0\local\lib\gstreamer-0.10"

+				CommandLine="copy /Y $(OutDir)\$(ProjectName).dll c:\msys\1.0\local\lib\gstreamer-0.10"

 			/>

 		</Configuration>

 	</Configurations>

@@ -216,8 +174,9 @@
 	</References>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			Name="Fichiers sources"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

 				RelativePath="..\..\sys\dshowsrcwrapper\gstdshow.cpp"

@@ -241,10 +200,15 @@
 			</File>

 		</Filter>

 		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

+			Name="Fichiers d&apos;en-tête"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

+				RelativePath="..\common\config.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\sys\dshowsrcwrapper\gstdshow.h"

 				>

 			</File>

@@ -262,8 +226,9 @@
 			</File>

 		</Filter>

 		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			Name="Fichiers de ressources"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

 		</Filter>

 	</Files>