summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2011-11-09 15:14:30 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2011-11-09 15:14:30 +0800
commit1afdcb9b0c7c795766a0f58c12271fc892a0f25d (patch)
tree8e4e43aea71c21b412cdb07b0a55ab08094c1331
parentda256ec45a148d188a24bbd86f1045d42388eeee (diff)
downloadcogl-1afdcb9b0c7c795766a0f58c12271fc892a0f25d.tar.gz
Update VS property sheets
-Force definition of COGL_ENABLE_EXPERIMENTAL_API for all COGL builds -Fix copying of crate.jpg (create destination folder first)
-rw-r--r--build/win32/vs10/cogl.props4
-rw-r--r--build/win32/vs9/cogl.vsprops3
2 files changed, 5 insertions, 2 deletions
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index adacca11..305e7005 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"</CoglBuildDefines>
+ <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>
<CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
<TestProgDef>TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
@@ -63,6 +63,8 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
copy ..\*.bat $(CopyDir)\bin
+mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data
+
copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 03386618..c2c41370 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;"
+ 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"
/>
<UserMacro
Name="CoglPangoBuildDefines"
@@ -90,6 +90,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&
copy ..\*.bat $(OutDir)\bin&#x0D;&#x0A;
+mkdir $(OutDir)\share\cogl-$(CoglApiVersion)\examples-data&#x0D;&#x0A;
copy ..\..\..\examples\crate.jpg $(OutDir)\share\cogl-$(CoglApiVersion)\examples-data&#x0D;&#x0A;
mkdir $(OutDir)\lib&#x0D;&#x0A;