diff options
| -rw-r--r-- | build/win32/vs10/pango.props | 9 | ||||
| -rw-r--r-- | build/win32/vs9/pango.vsprops | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/build/win32/vs10/pango.props b/build/win32/vs10/pango.props index cc0f0427..8b35fcfe 100644 --- 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 b41aa1c6..b002ff9e 100644 --- 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
 copy ..\..\..\pango\pangowin32.h $(OutDir)\include\pango-$(PangoApiVersion)\pango
 -mkdir $(OutDir)\etc\pango
 +if not exist $(OutDir)\etc\pango mkdir $(OutDir)\etc\pango
 + +if exist $(OutDir)\etc\pango\pango.aliases goto END
 echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > $(OutDir)\etc\pango\pango.aliases
 echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> $(OutDir)\etc\pango\pango.aliases
 echo serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(OutDir)\etc\pango\pango.aliases
 echo monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(OutDir)\etc\pango\pango.aliases
 +:END " /> <UserMacro |