luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix "install" paths in VS property sheets

Browse Source 
...and cleanup the VS2010 property sheets a little bit
This commit is contained in:
Chun-wei Fan 2012-03-15 16:39:52 +08:00
parent 53b02b023d
commit 1c42b6b092
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/win32/vs10/glib.props
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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">
<CopyDir>..\..\..\..\..\vs10\$(Platform)</CopyDir> <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir> <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
<ApiVersion>2.0</ApiVersion> <ApiVersion>2.0</ApiVersion>
<GlibDoInstall> <GlibDoInstall>
@ -528,7 +529,6 @@ copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
<GlibSeparateVS10DllSuffix>-2-vs10</GlibSeparateVS10DllSuffix> <GlibSeparateVS10DllSuffix>-2-vs10</GlibSeparateVS10DllSuffix>
<GlibDllPrefix>$(GlibSeparateVS10DllPrefix)</GlibDllPrefix> <GlibDllPrefix>$(GlibSeparateVS10DllPrefix)</GlibDllPrefix>
<GlibDllSuffix>$(GlibSeparateVS10DllSuffix)</GlibDllSuffix> <GlibDllSuffix>$(GlibSeparateVS10DllSuffix)</GlibDllSuffix>
<GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_PropertySheetDisplayName>glibprops</_PropertySheetDisplayName> <_PropertySheetDisplayName>glibprops</_PropertySheetDisplayName>
@ -577,6 +577,9 @@ perl ..\..\..\gio\data-to-c.pl ..\..\..\glib\gconstructor.h gconstructor_code >
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
<BuildMacro Include="CopyDir"> <BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value> <Value>$(CopyDir)</Value>
</BuildMacro> </BuildMacro>
@ -622,8 +625,5 @@ perl ..\..\..\gio\data-to-c.pl ..\..\..\glib\gconstructor.h gconstructor_code >
<BuildMacro Include="GlibDllSuffix"> <BuildMacro Include="GlibDllSuffix">
<Value>$(GlibDllSuffix)</Value> <Value>$(GlibDllSuffix)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
build/win32/vs9/glib.vsprops
View File

@ -359,6 +359,6 @@ copy ..\..\..\gio\gschema.dtd $(OutDir)\share\glib-$(ApiVersion)\schemas&#x0D;&#
/> />
<UserMacro <UserMacro
Name="GlibEtcInstallRoot" Name="GlibEtcInstallRoot"
Value="..\..\..\..\..\vs9\$(PlatformName)" Value="..\..\..\..\vs9\$(PlatformName)"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>