From 596b508653377216531db22c22271ac1309ab50d Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue, 20 Mar 2012 15:39:58 +0800
Subject: [PATCH] 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 565940bad..9497f2776 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 6d4f3aff2..ef4de04f5 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -22,6 +22,10 @@
 		Name="GlibEtcInstallRoot"
 		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&#x0D;&#x0A;
 :DONE_CONFIG_H&#x0D;&#x0A;
 
 cd ..&#x0D;&#x0A;
-gen-enums.bat $(GlibEtcInstallRoot)&#x0D;&#x0A;
+gen-enums.bat $(GlibMkEnumsPath)&#x0D;&#x0A;
 cd .\vs9&#x0D;&#x0A;
 
 "