[xiph-commits] r17192 - in trunk/oggdsf: . build/NSIS/Release src/lib/core/directshow/dsfOggDemux2

cristianadam at svn.xiph.org cristianadam at svn.xiph.org
Tue May 4 16:23:43 PDT 2010


Author: cristianadam
Date: 2010-05-04 16:23:43 -0700 (Tue, 04 May 2010)
New Revision: 17192

Modified:
   trunk/oggdsf/ChangeLog.txt
   trunk/oggdsf/build/NSIS/Release/build.cmd
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/CustomOggChainGranuleSeekTable.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxFilter.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
Log:
Small cleanup.

Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/ChangeLog.txt	2010-05-04 23:23:43 UTC (rev 17192)
@@ -3,8 +3,8 @@
     * Updated libvorbis to version 1.3.1
     * Updated libogg to version 1.2.0
     * Ogg Demux filter has been changed from a source + parser filter to just parser filter. This step allows usage of 
-       DirectShow's "File Source (Async.)" filter which give support of files bigger than 2GB, or "File Source (URL)" which
-       gives better networking support.
+      DirectShow's "File Source (Async.)" filter which gives support of files bigger than 2GB, or "File Source (URL)" which
+      gives better networking support (proxy, ipv6, etc.)
     * HTML5 <video> plug-in has received a couple of improvements:
         - URI support given by uriparser library
         - VMR9 support (instead of VMR7), this requires DirectX9
@@ -19,10 +19,10 @@
     * Windows 7 support (note that contextual menu entries in Windows Explorer is not yet available - Ticket #1619)
     * Added support for Theora 4:2:2 and 4:4:4 color sampling formats.
     * Added HTML5 <video> tag support for Microsoft Internet Explorer. This component is not enabled by default in the
-       installer and it is only a technical preview - only basic playback (play/pause by left click button), no seeking, no
-       controls and no HTML5 <video> interfaces support.
-       To use it this functionality in Internet Explorer simply add xmlns="http://www.w3.org/1999/xhtml/video" to the 
-       <video> tag.
+      installer and it is only a technical preview - only basic playback (play/pause by left click button), no seeking, no
+      controls and no HTML5 <video> interfaces support.
+      To use it this functionality in Internet Explorer simply add xmlns="http://www.w3.org/1999/xhtml/video" to the 
+      <video> tag.
     * Added 7.1 channels support for FLAC and support for files bigger than 2GBytes.
     * Prefixed all DirectShow filters with "Xiph.Org". This should simplify usage for GraphEdit/GraphStudio users.
     * Fixed #1474: The installer for 64-bit Stable Version (0.81.15562) - 06.12.2008 it's NOT working properly

Modified: trunk/oggdsf/build/NSIS/Release/build.cmd
===================================================================
--- trunk/oggdsf/build/NSIS/Release/build.cmd	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/build/NSIS/Release/build.cmd	2010-05-04 23:23:43 UTC (rev 17192)
@@ -19,7 +19,7 @@
 @set FILTERS=%FILTERS% dsfVorbisEncoder dsfVorbisDecoder
 @set FILTERS=%FILTERS% dsfCMMLDecoder dsfCMMLRawSource
 @set FILTERS=%FILTERS% dsfOggMux dsfAnxMux dsfOggDemux2
- at set FILTERS=%FILTERS% dsfOGMDecoder wmpinfo AxPlayer
+ at set FILTERS=%FILTERS% wmpinfo AxPlayer
 
 :: First make the x86 installer
 set X64=

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/CustomOggChainGranuleSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/CustomOggChainGranuleSeekTable.cpp	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/CustomOggChainGranuleSeekTable.cpp	2010-05-04 23:23:43 UTC (rev 17192)
@@ -45,7 +45,7 @@
                 continue;
             }
         }
-        //An error has occured.
+        //An error has occurred.
         isEnabled = false;
         break;
     }

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxFilter.cpp	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggDemuxFilter.cpp	2010-05-04 23:23:43 UTC (rev 17192)
@@ -198,7 +198,7 @@
 	return hr;	
 }
 
-STDMETHODIMP OggDemuxFilter::Stop(void) 
+STDMETHODIMP OggDemuxFilter::Stop() 
 {
 	CAutoLock locLock(m_pLock);
     LOG(logDEBUG) << __FUNCTIONW__;
@@ -362,9 +362,9 @@
 void OggDemuxFilter::removeMatchingBufferedPages(unsigned long inSerialNo)
 {
     std::vector<OggPage*> locNewList;
-	int locSize = m_bufferedPages.size();
+	size_t locSize = m_bufferedPages.size();
 	
-    for (int i = 0; i < locSize; i++) 
+    for (size_t i = 0; i < locSize; i++) 
     {
 		if (m_bufferedPages[i]->header()->StreamSerialNo() != inSerialNo) 
         {
@@ -381,7 +381,7 @@
 
 int OggDemuxFilter::GetPinCount() 
 {
-	return m_streamMapper->numPins() + 1;
+	return static_cast<int>(m_streamMapper->numPins() + 1);
 }
 
 CBasePin* OggDemuxFilter::GetPin(int inPinNo) 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.h	2010-05-04 23:23:43 UTC (rev 17192)
@@ -29,7 +29,7 @@
 
 	bool allStreamsReady();
 
-	unsigned long numPins()				{		return mPins.size();		}
+	size_t numPins()				{		return mPins.size();		}
 	OggDemuxOutputPin* getPinByIndex(unsigned long inIndex);
 
 protected:

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2-2005.vcproj	2010-05-04 23:23:43 UTC (rev 17192)
@@ -1027,10 +1027,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\FilterFileSource.h"
-				>
-			</File>
-			<File
 				RelativePath=".\IOggBaseTime.h"
 				>
 			</File>
@@ -1039,10 +1035,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\IOggFilterSeeker.h"
-				>
-			</File>
-			<File
 				RelativePath=".\IOggOutputPin.h"
 				>
 			</File>

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj	2010-05-04 20:20:42 UTC (rev 17191)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj	2010-05-04 23:23:43 UTC (rev 17192)
@@ -6,6 +6,7 @@
 	ProjectGUID="{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
 	RootNamespace="dsfOggDemux2"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -106,9 +107,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -192,19 +190,17 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -220,19 +216,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(BASECLASSES_WINCE)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
-				MinimalRebuild="true"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="&quot;$(BASECLASSES)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS"
 				ExceptionHandling="2"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
 				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -245,48 +244,48 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Strmiids.lib Ole32.Lib OleAut32.Lib Ws2.lib"
+				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib Ole32.Lib AdvAPI32.Lib OleAut32.Lib user32.lib WSock32.Lib ShLwApi.Lib "
 				OutputFile="$(OutDir)/dsfOggDemux2.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="dsfOggDemux2.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/dsfOggDemux2.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/dsfOggDemux2.lib"
-				TargetMachine="0"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -302,19 +301,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(BASECLASSES_WINCE)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
-				MinimalRebuild="true"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="&quot;$(BASECLASSES)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS"
 				ExceptionHandling="2"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
 				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -327,43 +330,42 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Strmiids.lib Ole32.Lib OleAut32.Lib Ws2.lib"
+				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib Ole32.Lib AdvAPI32.Lib OleAut32.Lib user32.lib WSock32.Lib ShLwApi.Lib "
 				OutputFile="$(OutDir)/dsfOggDemux2.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="dsfOggDemux2.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/dsfOggDemux2.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/dsfOggDemux2.lib"
-				TargetMachine="0"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -445,13 +447,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -467,22 +468,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;$(BASECLASSES)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(BASECLASSES_WINCE)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+				MinimalRebuild="true"
 				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -495,51 +493,48 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib Ole32.Lib AdvAPI32.Lib OleAut32.Lib user32.lib WSock32.Lib ShLwApi.Lib "
+				AdditionalDependencies="Strmiids.lib Ole32.Lib OleAut32.Lib Ws2.lib"
 				OutputFile="$(OutDir)/dsfOggDemux2.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="dsfOggDemux2.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/dsfOggDemux2.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/dsfOggDemux2.lib"
-				TargetMachine="1"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+			<DebuggerTool
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -555,23 +550,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;$(BASECLASSES)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(BASECLASSES_WINCE)&quot;;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+				MinimalRebuild="true"
 				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -584,41 +575,39 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib Ole32.Lib AdvAPI32.Lib OleAut32.Lib user32.lib WSock32.Lib ShLwApi.Lib "
+				AdditionalDependencies="Strmiids.lib Ole32.Lib OleAut32.Lib Ws2.lib"
 				OutputFile="$(OutDir)/dsfOggDemux2.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="dsfOggDemux2.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/dsfOggDemux2.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/dsfOggDemux2.lib"
-				TargetMachine="17"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+			<DebuggerTool
 			/>
 		</Configuration>
 		<Configuration
@@ -948,7 +937,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -956,7 +945,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -964,7 +953,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -972,7 +961,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -980,7 +969,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1027,10 +1016,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\FilterFileSource.h"
-				>
-			</File>
-			<File
 				RelativePath=".\IOggBaseTime.h"
 				>
 			</File>
@@ -1039,10 +1024,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\IOggFilterSeeker.h"
-				>
-			</File>
-			<File
 				RelativePath=".\IOggOutputPin.h"
 				>
 			</File>



More information about the commits mailing list