VS support: Fix VS2008/2010 property sheets

-Seperate intermediate folders for each project to remove redundant VS
 warnings/errors
-Don't create a folder for pango.aliases if the folder already exists
-Don't create pango.aliases if it already exists

diff --git a/build/win32/vs10/pango.props b/build/win32/vs10/pango.props
index cc0f042..8b35fcf 100644 (file)
--- a/build/win32/vs10/pango.props
+++ b/build/win32/vs10/pango.props
@@ -82,9 +82,11 @@ copy ..\..\..\pango\pangocairo.h $(CopyDir)\include\pango-$(PangoApiVersion)\pan
 copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 
 
-mkdir $(CopyDir)\etc\pango
+if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango
 
 
+if exist $(CopyDir)\etc\pango\pango.aliases goto END
+
 echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > $(CopyDir)\etc\pango\pango.aliases
 
 echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases
@@ -92,6 +94,8 @@ echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal"
 echo serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases
 
 echo monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases
+
+:END
 </PangoDoInstall>
 <PangoInstallFCHeaders>
 copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
@@ -111,10 +115,9 @@ copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
     <PangoDllSuffix>$(PangoSeparateVS10DllSuffix)</PangoDllSuffix>
   </PropertyGroup>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <_PropertySheetDisplayName>pangoprops</_PropertySheetDisplayName>
     <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\</IntDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

diff --git a/build/win32/vs9/pango.vsprops b/build/win32/vs9/pango.vsprops
index b41aa1c..b002ff9 100644 (file)
--- a/build/win32/vs9/pango.vsprops
+++ b/build/win32/vs9/pango.vsprops
@@ -4,7 +4,7 @@
        Version="8.00"
        Name="pangoprops"
        OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-       IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
+       IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
        >
        <Tool
                Name="VCCLCompilerTool"
@@ -106,11 +106,14 @@ copy ..\..\..\pango\pango-utils.h $(OutDir)\include\pango-$(PangoApiVersion)\pan
 copy ..\..\..\pango\pangocairo.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangowin32.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 
-mkdir $(OutDir)\etc\pango&#x0D;&#x0A;
+if not exist $(OutDir)\etc\pango mkdir $(OutDir)\etc\pango&#x0D;&#x0A;
+
+if exist $(OutDir)\etc\pango\pango.aliases goto END&#x0D;&#x0A;
 echo tahoma = &quot;tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; > $(OutDir)\etc\pango\pango.aliases&#x0D;&#x0A;
 echo sans = &quot;arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; >> $(OutDir)\etc\pango\pango.aliases&#x0D;&#x0A;
 echo serif = &quot;times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(OutDir)\etc\pango\pango.aliases&#x0D;&#x0A;
 echo monospace = &quot;courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(OutDir)\etc\pango\pango.aliases&#x0D;&#x0A;
+:END
 "
        />
        <UserMacro