brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Visual C++ support: Avoid redefinition warnings

Browse Source 
CLUTTER_WINDOWING_GDK is defined in the (pre-configured) clutter-config.h,
so don't define that in the Projects again.
This commit is contained in:
Chun-wei Fan 2012-05-16 17:21:10 +08:00
parent 1f7ff75a5c
commit 37e9215521
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/win32/vs10/clutter.vcxprojin
View File

@ -160,7 +160,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -218,7 +218,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -279,7 +279,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
@ -336,7 +336,7 @@
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>

8
build/win32/vs9/clutter.vcprojin
View File

@ -72,7 +72,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -149,7 +149,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -231,7 +231,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@ -307,7 +307,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines);CLUTTER_WINDOWING_GDK"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"