[cogl] Fix VS property sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] Fix VS property sheets
- Date: Tue, 20 Mar 2012 07:40:49 +0000 (UTC)
commit 596b508653377216531db22c22271ac1309ab50d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Mar 20 15:39:58 2012 +0800
Fix VS property sheets
Fix the situation where glib-mkenums isn't located correctly when COGL
is not built in a root folder of a drive (ex: COGL is not unpacked in
c:\ or D:\, but in c:\blah or d:\blah)
build/win32/vs10/cogl.props | 6 +++++-
build/win32/vs9/cogl.vsprops | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 565940b..9497f27 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+ <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
<CoglApiVersion>1.0</CoglApiVersion>
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
<LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
@@ -41,7 +42,7 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
cd ..
-gen-enums.bat $(GlibEtcInstallRoot)
+gen-enums.bat $(GlibMkEnumsPath)
cd .\vs10
@@ -229,6 +230,9 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
+ <BuildMacro Include="GlibEtcInstallRoot">
+ <Value>$(GlibMkEnumsPath)</Value>
+ </BuildMacro>
<BuildMacro Include="CoglApiVersion">
<Value>$(CoglApiVersion)</Value>
</BuildMacro>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 6d4f3af..ef4de04 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -23,6 +23,10 @@
Value="..\..\..\..\vs9\$(PlatformName)"
/>
<UserMacro
+ Name="GlibMkEnumsPath"
+ Value="..\..\..\vs9\$(PlatformName)"
+ />
+ <UserMacro
Name="CoglApiVersion"
Value="1.0"
/>
@@ -88,7 +92,7 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h

:DONE_CONFIG_H

cd ..

-gen-enums.bat $(GlibEtcInstallRoot)

+gen-enums.bat $(GlibMkEnumsPath)

cd .\vs9

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