From 30feab574a5bab8fcfd88644a2f2eb126e18d0df Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 24 Jul 2009 08:25:03 +0100 Subject: win32: Fix the distcheck after dshowsrcwrapper rearrangements Remove old files from the win32 manifest, and add the new one. --- win32/MANIFEST | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/MANIFEST b/win32/MANIFEST index 647176e4..4945cd14 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -5,7 +5,6 @@ win32/vs6/gst_plugins_bad.dsw win32/vs6/libgstdirectdraw.dsp win32/vs6/libgstdshow.dsp win32/vs6/libgstdshowdecwrapper.dsp -win32/vs6/libdshowsrcwrapper.dsp win32/vs6/libgstflv.dsp win32/vs6/libgstmpegvideoparse.dsp win32/vs6/libgstneon.dsp @@ -13,4 +12,4 @@ win32/vs7/gst-plugins-bad.sln win32/vs7/libgstdirectdraw.vcproj win32/vs8/gst-plugins-bad.sln win32/vs8/libgstdirectdraw.vcproj -win32/common/libgstdshow.def +win32/vs8/libdshowsrcwrapper.vcproj -- cgit v1.2.1 From dabb692e7cec9eaef0703a2cabefc65cb12738ff Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Mon, 27 Jul 2009 14:52:57 +0200 Subject: dshowsrcwrapper: remove use of IGstDshowInterface --- win32/vs8/libdshowsrcwrapper.vcproj | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'win32') diff --git a/win32/vs8/libdshowsrcwrapper.vcproj b/win32/vs8/libdshowsrcwrapper.vcproj index d18e66f8..a87b8603 100755 --- a/win32/vs8/libdshowsrcwrapper.vcproj +++ b/win32/vs8/libdshowsrcwrapper.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="C:\msys\1.0\local\include;C:\msys\1.0\local\include\libxml2;"C:\msys\1.0\local\include\glib-2.0";"C:\msys\1.0\local\lib\glib-2.0\include";"C:\msys\1.0\local\include\gstreamer-0.10";..\common;"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses"" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DSHOWSRCWRAPPER_EXPORTS;HAVE_CONFIG_H;COBJMACROS;_WIN32_DCOM;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DSHOWSRCWRAPPER_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -78,7 +78,7 @@ LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="C:\msys\1.0\local\lib;"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib";"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses\XP32_RETAIL"" - ModuleDefinitionFile="..\..\sys\dshowsrcwrapper\libgstdshow.def" + ModuleDefinitionFile="" ProgramDatabaseFile=".\Release/libgstdshowsrcwrapper.pdb" ImportLibrary=".\Release/libgstdshowsrcwrapper.lib" TargetMachine="1" @@ -146,7 +146,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="C:\msys\1.0\local\include;C:\msys\1.0\local\include\libxml2;"C:\msys\1.0\local\include\glib-2.0";"C:\msys\1.0\local\lib\glib-2.0\include";"C:\msys\1.0\local\include\gstreamer-0.10";..\common;"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses"" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;DSHOWSRCWRAPPER_EXPORTS;HAVE_CONFIG_H;COBJMACROS;_WIN32_DCOM;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;DSHOWSRCWRAPPER_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -177,7 +177,7 @@ LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="C:\msys\1.0\local\lib;"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib";"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses\XP32_DEBUG"" - ModuleDefinitionFile="..\..\sys\dshowsrcwrapper\libgstdshow.def" + ModuleDefinitionFile="" GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/libgstdshowsrcwrapper.pdb" ImportLibrary=".\Debug/libgstdshowsrcwrapper.lib" @@ -239,10 +239,6 @@ RelativePath="..\..\sys\dshowsrcwrapper\gstdshowvideosrc.cpp" > - - - - -- cgit v1.2.1 From b3b96c3063b92253a67f8ea8263faf1b1bf5945b Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Mon, 27 Jul 2009 15:33:04 +0200 Subject: directdrawsink: update vs8 build also remove directdrawsink from vs6 and vs7 build --- win32/MANIFEST | 3 - win32/vs6/gst_plugins_bad.dsw | 24 ------- win32/vs7/gst-plugins-bad.sln | 29 -------- win32/vs7/libgstdirectdraw.vcproj | 145 -------------------------------------- win32/vs8/libgstdirectdraw.vcproj | 24 ++++--- 5 files changed, 14 insertions(+), 211 deletions(-) delete mode 100644 win32/vs7/gst-plugins-bad.sln delete mode 100644 win32/vs7/libgstdirectdraw.vcproj mode change 100644 => 100755 win32/vs8/libgstdirectdraw.vcproj (limited to 'win32') diff --git a/win32/MANIFEST b/win32/MANIFEST index 4945cd14..a0d954aa 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -2,14 +2,11 @@ win32/MANIFEST win32/common/config.h win32/common/config.h.in win32/vs6/gst_plugins_bad.dsw -win32/vs6/libgstdirectdraw.dsp win32/vs6/libgstdshow.dsp win32/vs6/libgstdshowdecwrapper.dsp win32/vs6/libgstflv.dsp win32/vs6/libgstmpegvideoparse.dsp win32/vs6/libgstneon.dsp -win32/vs7/gst-plugins-bad.sln -win32/vs7/libgstdirectdraw.vcproj win32/vs8/gst-plugins-bad.sln win32/vs8/libgstdirectdraw.vcproj win32/vs8/libdshowsrcwrapper.vcproj diff --git a/win32/vs6/gst_plugins_bad.dsw b/win32/vs6/gst_plugins_bad.dsw index 388fd822..6d0c9b5c 100755 --- a/win32/vs6/gst_plugins_bad.dsw +++ b/win32/vs6/gst_plugins_bad.dsw @@ -15,30 +15,6 @@ Package=<4> ############################################################################### -Project: "libgstdshow"=".\libgstdshow.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libgstdshowdecwrapper"=".\libgstdshowdecwrapper.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "libgstflv"=".\libgstflv.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/vs7/gst-plugins-bad.sln b/win32/vs7/gst-plugins-bad.sln deleted file mode 100644 index 2df4288f..00000000 --- a/win32/vs7/gst-plugins-bad.sln +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstdirectsound", "libgstdirectsound.vcproj", "{566A2EB9-984C-4027-86DD-EDC7B390C679}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstdirectdraw", "libgstdirectdraw.vcproj", "{1594A623-5529-4B86-BD4A-694CF0BDB5C4}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {566A2EB9-984C-4027-86DD-EDC7B390C679}.Debug.ActiveCfg = Debug|Win32 - {566A2EB9-984C-4027-86DD-EDC7B390C679}.Debug.Build.0 = Debug|Win32 - {566A2EB9-984C-4027-86DD-EDC7B390C679}.Release.ActiveCfg = Release|Win32 - {566A2EB9-984C-4027-86DD-EDC7B390C679}.Release.Build.0 = Release|Win32 - {1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Debug.ActiveCfg = Debug|Win32 - {1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Debug.Build.0 = Debug|Win32 - {1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Release.ActiveCfg = Release|Win32 - {1594A623-5529-4B86-BD4A-694CF0BDB5C4}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/win32/vs7/libgstdirectdraw.vcproj b/win32/vs7/libgstdirectdraw.vcproj deleted file mode 100644 index 553d0c08..00000000 --- a/win32/vs7/libgstdirectdraw.vcproj +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs8/libgstdirectdraw.vcproj b/win32/vs8/libgstdirectdraw.vcproj old mode 100644 new mode 100755 index 31af1ca9..0e64b45f --- a/win32/vs8/libgstdirectdraw.vcproj +++ b/win32/vs8/libgstdirectdraw.vcproj @@ -40,14 +40,14 @@ @@ -201,6 +201,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + +