GNOME.org
 

[cogl/msvc-support] Update Visual C++ projects/properties...

commit 236503f69afde8c3a25b69eda9ce20c976e8c029
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 31 11:58:42 2011 +0800

    Update Visual C++ projects/properties...
    
    -Make the Pre-defined Macros (CFLAGS) more consistent with the autotools
     builds for Debug and Release builds.  Also re-instated the
     _WIN32_WINNT=0x0500 macro for COGL and COGL-Pango-this would probably
     fix some problems regarding 32-bit builds
    
    -Force export of _cogl_debug_flags as it is needed by COGL-Pango as
     COGL_ENABLE_DEBUG is defined for all builds

 build/win32/vs10/cogl-pango.vcxprojin |    8 ++++----
 build/win32/vs10/cogl.props           |   10 +++++++++-
 build/win32/vs10/cogl.vcxprojin       |   12 ++++++++----
 build/win32/vs9/cogl-pango.vcprojin   |    8 ++++----
 build/win32/vs9/cogl.vcprojin         |    8 ++++----
 build/win32/vs9/cogl.vsprops          |   10 +++++++++-
 6 files changed, 38 insertions(+), 18 deletions(-)
---
diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 6b37695..9e29b1b 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -78,7 +78,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<PreprocessorDefinitions>_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -106,7 +106,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<PreprocessorDefinitions>_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -135,7 +135,7 @@
 		<ClCompile>
 			<Optimization>MaxSpeed</Optimization>
 			<IntrinsicFunctions>true</IntrinsicFunctions>
-			<PreprocessorDefinitions>$(LibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<FunctionLevelLinking>true</FunctionLevelLinking>
 			<PrecompiledHeader>
@@ -163,7 +163,7 @@
 			<Command>$(PreBuildCmd)</Command>
 		</PreBuildEvent>
 		<ClCompile>
-			<PreprocessorDefinitions>$(LibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<PrecompiledHeader>
 			</PrecompiledHeader>
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 2f1563b..91809fe 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -3,7 +3,9 @@
   <PropertyGroup Label="UserMacros">
     <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
     <CoglApiVersion>2.0</CoglApiVersion>
-    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION</LibBuildDefines>
+    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</LibBuildDefines>
+	<ReleaseLibBuildDefines>G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
+	<DebugLibBuildDefines>COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
     <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT</CoglBuildDefines>
     <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
 	<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
@@ -196,6 +198,12 @@ copy ..\..\..\cogl\cogl2-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\
     <BuildMacro Include="LibBuildDefines">
       <Value>$(LibBuildDefines)</Value>
     </BuildMacro>
+	<BuildMacro Include="ReleaseLibBuildDefines">
+      <Value>$(ReleaseLibBuildDefines)</Value>
+    </BuildMacro>
+	<BuildMacro Include="DebugLibBuildDefines">
+      <Value>$(DebugLibBuildDefines)</Value>
+    </BuildMacro>
     <BuildMacro Include="CoglBuildDefines">
       <Value>$(CoglBuildDefines)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin
index f5f0269..520f6ce 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -75,7 +75,7 @@
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
 			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,6 +95,7 @@
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX86</TargetMachine>
+			<AdditionalOptions>/EXPORT:_cogl_debug_flags %(AdditionalOptions)</AdditionalOptions>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -104,7 +105,7 @@
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
 			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -124,6 +125,7 @@
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Windows</SubSystem>
 			<TargetMachine>MachineX64</TargetMachine>
+			<AdditionalOptions>/EXPORT:_cogl_debug_flags %(AdditionalOptions)</AdditionalOptions>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -134,7 +136,7 @@
 			<Optimization>MaxSpeed</Optimization>
 			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<IntrinsicFunctions>true</IntrinsicFunctions>
-			<PreprocessorDefinitions>$(LibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>$(LibBuildDefines);$(ReleaseBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<FunctionLevelLinking>true</FunctionLevelLinking>
 			<PrecompiledHeader>
@@ -155,6 +157,7 @@
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
 			<TargetMachine>MachineX86</TargetMachine>
+			<AdditionalOptions>/EXPORT:_cogl_debug_flags %(AdditionalOptions)</AdditionalOptions>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -163,7 +166,7 @@
 		</PreBuildEvent>
 		<ClCompile>
 			<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>$(LibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<PrecompiledHeader>
 			</PrecompiledHeader>
@@ -183,6 +186,7 @@
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
 			<TargetMachine>MachineX64</TargetMachine>
+			<AdditionalOptions>/EXPORT:_cogl_debug_flags %(AdditionalOptions)</AdditionalOptions>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>
diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index 140bf8c..5536a05 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglPangoBuildDefines)"
+				PreprocessorDefinitions="_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglPangoBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -71,7 +71,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglPangoBuildDefines)"
+				PreprocessorDefinitions="_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglPangoBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(LibBuildDefines);$(CoglPangoBuildDefines)"
+				PreprocessorDefinitions="$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -149,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(LibBuildDefines);$(CoglPangoBuildDefines)"
+				PreprocessorDefinitions="$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglPangoBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin
index 27bb0c5..10b7f56 100644
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@@ -33,7 +33,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
-				PreprocessorDefinitions="_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglBuildDefines)"
+				PreprocessorDefinitions="_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -71,7 +71,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
-				PreprocessorDefinitions="_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(CoglBuildDefines)"
+				PreprocessorDefinitions="_DEBUG;$(LibBuildDefines);$(DebugLibBuildDefines);$(CoglBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -111,7 +111,7 @@
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(LibBuildDefines);$(CoglBuildDefines)"
+				PreprocessorDefinitions="$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
-				PreprocessorDefinitions="$(LibBuildDefines);$(CoglBuildDefines)"
+				PreprocessorDefinitions="$(LibBuildDefines);$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 53b9092..c5df9ab 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -28,7 +28,15 @@
 	/>
 	<UserMacro
 		Name="LibBuildDefines"
-		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION"
+		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG"
+	/>
+	<UserMacro
+		Name="ReleaseLibBuildDefines"
+		Value="G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
+	/>
+	<UserMacro
+		Name="DebugLibBuildDefines"
+		Value="COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG"
 	/>
 	<UserMacro
 		Name="CoglBuildDefines"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]