[cogl/msvc-support] Update VS support



commit 9eb8ad196207e41cf6752f9117690d7a1d11aea4
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Nov 9 15:39:51 2011 +0800

    Update VS support
    
    -Revert changes in VS property sheets regarding
     COGL_ENABLE_EXPERIMENTAL_API, as that is supposed to be in
     config.h during compilation.
    -Update config.h.win32.in accordingly as a result.

 build/win32/vs10/cogl.props  |    2 +-
 build/win32/vs9/cogl.vsprops |    2 +-
 config.h.win32.in            |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 305e700..551e67b 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -7,7 +7,7 @@
     <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
     <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
     <DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
-    <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir";COGL_ENABLE_EXPERIMENTAL_API</CoglBuildDefines>
+    <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>
     <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
     <TestProgDef>TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index c2c4137..8e3bfe1 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -44,7 +44,7 @@
 	/>
 	<UserMacro
 		Name="CoglBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;Cogl\&quot;;COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME=\&quot;\&quot;;COGL_LOCALEDIR=\&quot;/some/random/dir\&quot;;COGL_ENABLE_EXPERIMENTAL_API"
+		Value="G_LOG_DOMAIN=\&quot;Cogl\&quot;;COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME=\&quot;\&quot;;COGL_LOCALEDIR=\&quot;/some/random/dir\&quot;"
 	/>
 	<UserMacro
 		Name="CoglPangoBuildDefines"
diff --git a/config.h.win32.in b/config.h.win32.in
index 7b99f72..6bd1b01 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -3,6 +3,9 @@
 /* Can use Cogl 2.0 API internally */
 #define COGL_ENABLE_EXPERIMENTAL_2_0_API 1
 
+/* Can use experimental API internally */
+#define COGL_ENABLE_EXPERIMENTAL_API 1
+
 /* Cogl supports OpenGL using the WGL API */
 #define COGL_HAS_WGL_SUPPORT 1
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]