diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-07-09 16:09:22 +0800 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-08-06 18:51:31 +0100 |
| commit | 0ac0ef34dbc87fc1fa7117402b7ea87153bcda40 (patch) | |
| tree | b8409c7bc33435144123eeba28b47f1a410d0e32 /build | |
| parent | 786d1b8e40e47c7a9cb70c01aee54e822d83fb8d (diff) | |
| download | cogl-0ac0ef34dbc87fc1fa7117402b7ea87153bcda40.tar.gz | |
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)
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/vs10/cogl.props | 6 | ||||
| -rw-r--r-- | 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 950213b0..cb46ddfe 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 <GenerateCoglDef>
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
</GenerateCoglDef>
<GenerateCoglSDLDef>
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
</GenerateCoglDef>
<GenerateCoglPangoDef>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index c7095b4a..c4af8502 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

"
/>
<UserMacro
Name="GenerateCoglSDLDef"
Value="
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

"
/>
<UserMacro
|