diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-03-20 15:39:58 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-03-20 15:39:58 +0800 |
| commit | 596b508653377216531db22c22271ac1309ab50d (patch) | |
| tree | 6eba93e3694bf57a4dc1dda04e0b2d56bb777b33 /build | |
| parent | ef9aa07d2e8f030416289ba4414c05b5526ca358 (diff) | |
| download | cogl-596b508653377216531db22c22271ac1309ab50d.tar.gz | |
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)
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, 10 insertions, 2 deletions
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 565940ba..9497f277 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 6d4f3aff..ef4de04f 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

"
|