Fixed : broken x64 compilation with Sync Renderer merge

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1478 10f7b99b-c216-0410-bff0-8a66a9350fd8

2 files changed, 27 insertions, 57 deletions

diff --git a/src/filters/misc/SyncClock/SyncClock.cpp b/src/filters/misc/SyncClock/SyncClock.cpp
index 34f69ec94..51f70c74c 100644
--- a/src/filters/misc/SyncClock/SyncClock.cpp
+++ b/src/filters/misc/SyncClock/SyncClock.cpp
@@ -10,7 +10,7 @@
 

 const AMOVIESETUP_FILTER sudFilter[] =

 {

-	{&__uuidof(CSyncClockFilter), L"SyncClock", MERIT_NORMAL, 0, NULL}

+	{&__uuidof(CSyncClockFilter), L"SyncClock", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory}

 };

 

 CFactoryTemplate g_Templates[] =

diff --git a/src/filters/misc/SyncClock/SyncClock.vcproj b/src/filters/misc/SyncClock/SyncClock.vcproj
index 69f67a73a..cf0c14fa2 100644
--- a/src/filters/misc/SyncClock/SyncClock.vcproj
+++ b/src/filters/misc/SyncClock/SyncClock.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="SyncClock"

 	ProjectGUID="{0B63409D-674D-47F8-A84E-87DBB7783189}"

 	RootNamespace="Metronome"

@@ -46,7 +46,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

@@ -91,6 +91,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="2"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			CharacterSet="1"

 			>

 			<Tool

@@ -112,7 +113,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\BaseClasses\"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METRONOME_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -135,7 +136,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="strmbasd.lib winmm.lib msvcrtd.lib"

 				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\BaseClasses\x64\Debug\"

+				AdditionalLibraryDirectories="..\..\..\..\lib64"

 				IgnoreAllDefaultLibraries="true"

 				ModuleDefinitionFile="metronom.def"

 				GenerateDebugInformation="true"

@@ -238,6 +239,7 @@
 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -260,7 +262,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -281,7 +283,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="strmbase.lib winmm.lib msvcrt.lib"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\BaseClasses\x64\Release\"

+				AdditionalLibraryDirectories="..\..\..\..\lib64"

 				IgnoreAllDefaultLibraries="true"

 				ModuleDefinitionFile="metronom.def"

 				GenerateDebugInformation="true"

@@ -341,7 +343,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -385,7 +387,8 @@
 			Name="Release Unicode lib|x64"

 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

+			ConfigurationType="4"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -408,13 +411,13 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

+				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				DebugInformationFormat="3"

-				CallingConvention="2"

+				CallingConvention="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -426,27 +429,13 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib winmm.lib msvcrt.lib"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\BaseClasses\x64\Release\"

-				IgnoreAllDefaultLibraries="true"

-				ModuleDefinitionFile="metronom.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

+				Name="VCLibrarianTool"

+				AdditionalLibraryDirectories="..\..\..\..\lib64"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -456,9 +445,6 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -493,7 +479,7 @@
 				EnableIntrinsicFunctions="false"

 				FavorSizeOrSpeed="0"

 				OmitFramePointers="false"

-				AdditionalIncludeDirectories="..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				StringPooling="false"

 				BasicRuntimeChecks="3"

@@ -538,7 +524,8 @@
 			Name="Debug Unicode lib|x64"

 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-			ConfigurationType="2"

+			ConfigurationType="4"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -560,14 +547,14 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

-				RuntimeLibrary="0"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

+				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				DebugInformationFormat="3"

-				CallingConvention="2"

+				CallingConvention="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -579,27 +566,13 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="strmbase.lib winmm.lib msvcrt.lib"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\BaseClasses\x64\Release\"

-				IgnoreAllDefaultLibraries="true"

-				ModuleDefinitionFile="metronom.def"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

+				Name="VCLibrarianTool"

+				AdditionalLibraryDirectories="..\..\..\..\lib64"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -609,9 +582,6 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>