diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2012-06-20 19:49:08 +0200 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-08-06 14:27:45 +0100 |
| commit | 93d0de1d9acf03a99d5fc580cb64fc483983f197 (patch) | |
| tree | f7200c1589ecc393bcf52a28cc79ec4b1c458b46 /build | |
| parent | 4ad1e9b83af4051978f301ee2323c6bb7bf0378d (diff) | |
| download | cogl-93d0de1d9acf03a99d5fc580cb64fc483983f197.tar.gz | |
Mass rename CLUTTER_COMPILATION to COGL_COMPILATION
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/vs10/cogl.props | 4 | ||||
| -rw-r--r-- | build/win32/vs9/cogl.vsprops | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 3b32e1ed..950213b0 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -5,12 +5,12 @@ <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
<CoglApiVersion>1.0</CoglApiVersion>
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
- <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
+ <LibBuildDefines>HAVE_CONFIG_H;COGL_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"</CoglBuildDefines>
<CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
- <TestProgDef>CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
+ <TestProgDef>COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DoDefinesSDL>
if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index 4a77ec3e..c7095b4a 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -36,7 +36,7 @@ />
<UserMacro
Name="LibBuildDefines"
- Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)"
+ Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
/>
<UserMacro
Name="ReleaseLibBuildDefines"
@@ -56,7 +56,7 @@ />
<UserMacro
Name="TestProgDef"
- Value="CLUTTER_COMPILATION;TESTS_DATADIR=\"../share/cogl-$(CoglApiVersion)/tests\""
+ Value="COGL_COMPILATION;TESTS_DATADIR=\"../share/cogl-$(CoglApiVersion)/tests\""
/>
<UserMacro
Name="DoDefinesSDL"
|