From 0ac0ef34dbc87fc1fa7117402b7ea87153bcda40 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 9 Jul 2012 16:09:22 +0800 Subject: [PATCH] Fix up Visual C++ property sheets The command to copy cogl-gl-header.h from the pre-configured cogl-gl-header.h.win32 is wrong. Fix that. Also add -DCOGL_ENABLE_EXPERIMENTAL_API for all creations of the cogl.def (cherry picked from commit 6df152c411749a610a57ecaab6a983b51d2a7612) --- build/win32/vs10/cogl.props | 6 +++--- build/win32/vs9/cogl.vsprops | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 950213b0b..cb46ddfea 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -39,7 +39,7 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h :DONE_CONFIG_H -if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32 copy ..\..\..\cogl\cogl-gl-header.h +if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h cd .. @@ -195,13 +195,13 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio echo EXPORTS > ..\..\..\cogl\cogl.def - cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def + cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def echo EXPORTS > ..\..\..\cogl\cogl.def - cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def + cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index c7095b4ad..c4af85022 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -89,7 +89,7 @@ copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h Value=" if exist ..\..\..\config.h goto DONE_CONFIG_H copy ..\..\..\config.h.win32 ..\..\..\config.h -if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32 copy ..\..\..\cogl\cogl-gl-header.h +if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h :DONE_CONFIG_H cd .. @@ -183,14 +183,14 @@ copy ..\..\..\tests\data\valgrind.suppressions $(OutDir)\share\cogl-$(CoglApiVer Name="GenerateCoglDef" Value=" echo EXPORTS > ..\..\..\cogl\cogl.def - cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def + cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def " />