mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 12:02:04 +00:00
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)
This commit is contained in:
parent
ef9aa07d2e
commit
596b508653
@ -2,6 +2,7 @@
|
|||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup Label="UserMacros">
|
<PropertyGroup Label="UserMacros">
|
||||||
<GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
|
<GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
|
||||||
|
<GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
|
||||||
<CoglApiVersion>1.0</CoglApiVersion>
|
<CoglApiVersion>1.0</CoglApiVersion>
|
||||||
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
|
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
|
||||||
<LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
|
<LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
|
||||||
@ -41,7 +42,7 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
|
|||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
gen-enums.bat $(GlibEtcInstallRoot)
|
gen-enums.bat $(GlibMkEnumsPath)
|
||||||
|
|
||||||
cd .\vs10
|
cd .\vs10
|
||||||
|
|
||||||
@ -229,6 +230,9 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
|
|||||||
<BuildMacro Include="GlibEtcInstallRoot">
|
<BuildMacro Include="GlibEtcInstallRoot">
|
||||||
<Value>$(GlibEtcInstallRoot)</Value>
|
<Value>$(GlibEtcInstallRoot)</Value>
|
||||||
</BuildMacro>
|
</BuildMacro>
|
||||||
|
<BuildMacro Include="GlibEtcInstallRoot">
|
||||||
|
<Value>$(GlibMkEnumsPath)</Value>
|
||||||
|
</BuildMacro>
|
||||||
<BuildMacro Include="CoglApiVersion">
|
<BuildMacro Include="CoglApiVersion">
|
||||||
<Value>$(CoglApiVersion)</Value>
|
<Value>$(CoglApiVersion)</Value>
|
||||||
</BuildMacro>
|
</BuildMacro>
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
Name="GlibEtcInstallRoot"
|
Name="GlibEtcInstallRoot"
|
||||||
Value="..\..\..\..\vs9\$(PlatformName)"
|
Value="..\..\..\..\vs9\$(PlatformName)"
|
||||||
/>
|
/>
|
||||||
|
<UserMacro
|
||||||
|
Name="GlibMkEnumsPath"
|
||||||
|
Value="..\..\..\vs9\$(PlatformName)"
|
||||||
|
/>
|
||||||
<UserMacro
|
<UserMacro
|
||||||
Name="CoglApiVersion"
|
Name="CoglApiVersion"
|
||||||
Value="1.0"
|
Value="1.0"
|
||||||
@ -88,7 +92,7 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h

|
|||||||
:DONE_CONFIG_H

|
:DONE_CONFIG_H

|
||||||
|
|
||||||
cd ..

|
cd ..

|
||||||
gen-enums.bat $(GlibEtcInstallRoot)

|
gen-enums.bat $(GlibMkEnumsPath)

|
||||||
cd .\vs9

|
cd .\vs9

|
||||||
|
|
||||||
"
|
"
|
||||||
|
Loading…
Reference in New Issue
Block a user