summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2013-12-03 16:16:29 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2013-12-03 16:16:29 +0800
commit23ce626acc74c767add6fa6c43060727dbcc606f (patch)
tree1cffca5966169cfca413677f33415ce66073c110 /build
parentca7d1cf957864fad0470c70511565c6b5def705d (diff)
downloadpango-23ce626acc74c767add6fa6c43060727dbcc606f.tar.gz
Split up the MSVC 2008 Property Sheets
...so that the maintenance of these files would be easier
Diffstat (limited to 'build')
-rw-r--r--build/win32/vs9/Makefile.am15
-rw-r--r--build/win32/vs9/gengir.vcproj8
-rw-r--r--build/win32/vs9/install.vcproj32
-rw-r--r--build/win32/vs9/pango-build-defines.vsprops37
-rw-r--r--build/win32/vs9/pango-gengir.vsprops21
-rw-r--r--build/win32/vs9/pango-install-bin.vsprops40
-rw-r--r--build/win32/vs9/pango-install.vspropsin36
-rw-r--r--build/win32/vs9/pango-prebuild.vsprops35
-rw-r--r--build/win32/vs9/pango-version-paths.vsprops49
-rw-r--r--build/win32/vs9/pango.vcprojin10
-rw-r--r--build/win32/vs9/pango.vspropsin185
-rw-r--r--build/win32/vs9/pangocairo.vcprojin20
-rw-r--r--build/win32/vs9/pangoft2.vcprojin10
-rw-r--r--build/win32/vs9/pangowin32.vcproj8
14 files changed, 268 insertions, 238 deletions
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index d1cc682e..eb8189bb 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,8 +1,13 @@
EXTRA_DIST = \
pango.sln \
- pango.vspropsin \
- pango.vsprops \
+ pango-build-defines.vsprops \
+ pango-gengir.vsprops \
pango-ignore-fc.vsprops \
+ pango-install-bin.vsprops \
+ pango-install.vsprops \
+ pango-install.vspropsin \
+ pango-prebuild.vsprops \
+ pango-version-paths.vsprops \
pango.vcprojin \
pango.vcproj \
pangoft2.vcprojin \
@@ -15,10 +20,10 @@ EXTRA_DIST = \
gengir.vcproj \
README.txt
-pango.vsprops: $(top_srcdir)/build/win32/vs9/pango.vspropsin pango.vs9.headers
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vspropsin >$@
+pango-install.vsprops: $(top_srcdir)/build/win32/vs9/pango-install.vspropsin pango.vs9.headers
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango-install.vspropsin >$@
rm pango.vs9.headers
-DISTCLEANFILES = pango.vsprops
+DISTCLEANFILES = pango-install.vsprops
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj
index f45a91df..18f1115e 100644
--- a/build/win32/vs9/gengir.vcproj
+++ b/build/win32/vs9/gengir.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -34,7 +34,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -47,7 +47,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -61,7 +61,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-gengir.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index e8255ae5..b7ef800d 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -23,59 +23,59 @@
Name="Debug_FC|Win32"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Release_FC|Win32"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
CharacterSet="2"
DeleteExtensionsOnClean=""
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Debug_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -83,12 +83,12 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -96,12 +96,12 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Release_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -110,12 +110,12 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -124,7 +124,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
+ CommandLine="$(PangoInstallBin) $(PangoInstallHeadersData)"
/>
</Configuration>
</Configurations>
diff --git a/build/win32/vs9/pango-build-defines.vsprops b/build/win32/vs9/pango-build-defines.vsprops
new file mode 100644
index 00000000..a2e72393
--- /dev/null
+++ b/build/win32/vs9/pango-build-defines.vsprops
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangobuilddefinesprops"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+ InheritedPropertySheets=".\pango-version-paths.vsprops"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2"
+ PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES"
+ ForcedIncludeFiles="msvc_recommended_pragmas.h"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib"
+ AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+ />
+ <UserMacro
+ Name="PangoBinaryVersion"
+ Value="1.8.0"
+ />
+ <UserMacro
+ Name="PangoDummyPrefix"
+ Value="/dummy"
+ />
+ <UserMacro
+ Name="PangoDefines"
+ Value="G_LOG_DOMAIN=\&quot;Pango\&quot;;PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR=\&quot;$(PangoDummyPrefix)/etc\&quot;;LIBDIR=\&quot;$(PangoDummyPrefix)/lib\&quot;"
+ />
+ <UserMacro
+ Name="NoFCDef"
+ Value="PANGO_VISUALC_NO_FC"
+ />
+</VisualStudioPropertySheet> \ No newline at end of file
diff --git a/build/win32/vs9/pango-gengir.vsprops b/build/win32/vs9/pango-gengir.vsprops
new file mode 100644
index 00000000..4ce81e45
--- /dev/null
+++ b/build/win32/vs9/pango-gengir.vsprops
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangogengirprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
+ >
+ <UserMacro
+ Name="DoGenGir"
+ Value="
+set VSVER=$(VSVer)&#x0D;&#x0A;
+set CONF=$(ConfigurationName)&#x0D;&#x0A;
+set PLAT=$(PlatformName)&#x0D;&#x0A;
+set BASEDIR=$(GlibEtcInstallRoot)&#x0D;&#x0A;
+
+cd ..&#x0D;&#x0A;
+call gengir_pango.bat&#x0D;&#x0A;
+cd vs$(VSVer)&#x0D;&#x0A;
+ "
+ />
+</VisualStudioPropertySheet> \ No newline at end of file
diff --git a/build/win32/vs9/pango-install-bin.vsprops b/build/win32/vs9/pango-install-bin.vsprops
new file mode 100644
index 00000000..8ca87a08
--- /dev/null
+++ b/build/win32/vs9/pango-install-bin.vsprops
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangoinstallbinprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
+ >
+ <UserMacro
+ Name="PangoInstallBin"
+ Value="
+mkdir $(CopyDir)\bin&#x0D;&#x0A;
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Release_FC&quot; goto DO_FC_BIN&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_FC&quot; goto DO_FC_BIN&#x0D;&#x0A;
+
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+goto DONE_BIN&#x0D;&#x0A;
+
+:DO_FC_BIN&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Release_FC&quot; copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_FC&quot; copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_FC&quot; copy $(SolutionDir)\Release\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_FC&quot; copy $(SolutionDir)\Release\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_FC&quot; copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_FC&quot; copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_FC&quot; copy $(SolutionDir)\Debug\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_FC&quot; copy $(SolutionDir)\Debug\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+:DONE_BIN&#x0D;&#x0A;
+ "
+ />
+</VisualStudioPropertySheet> \ No newline at end of file
diff --git a/build/win32/vs9/pango-install.vspropsin b/build/win32/vs9/pango-install.vspropsin
new file mode 100644
index 00000000..9956753f
--- /dev/null
+++ b/build/win32/vs9/pango-install.vspropsin
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangoinstallprops"
+ InheritedPropertySheets=".\pango-install-bin.vsprops"
+ >
+ <UserMacro
+ Name="PangoInstallHeadersData"
+ Value="
+#include "pango.vs9.headers"
+copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pango-enum-types.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; goto DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; goto DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
+
+copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+
+:DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
+if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango&#x0D;&#x0A;
+
+if exist $(CopyDir)\etc\pango\pango.aliases goto END&#x0D;&#x0A;
+echo tahoma = &quot;tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; > $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
+echo sans = &quot;arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
+echo serif = &quot;times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
+echo monospace = &quot;courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
+:END
+"
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/pango-prebuild.vsprops b/build/win32/vs9/pango-prebuild.vsprops
new file mode 100644
index 00000000..321520cd
--- /dev/null
+++ b/build/win32/vs9/pango-prebuild.vsprops
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangoprebuildprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="
+if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
+copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
+:DONE_CONFIG_H&#x0D;&#x0A;
+
+if exist ..\..\..\pango\DONE_MODULE_DEFS_H goto DONE_MODULE_DEFS_H&#x0D;&#x0A;
+copy /y ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\module-defs.h&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\DONE_MODULE_DEFS_H&#x0D;&#x0A;
+:DONE_MODULE_DEFS_H&#x0D;&#x0A;
+
+if exist ..\..\..\pango\DONE_MODULE_DEFS_LANG_C goto DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\module-defs-lang.c&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
+:DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
+
+if exist ..\..\..\pango\DONE_MODULE_DEFS_FC_C goto DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\module-defs-fc.c&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
+:DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
+
+if exist ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C goto DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\module-defs-win32.c&#x0D;&#x0A;
+copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
+:DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
+"
+ />
+</VisualStudioPropertySheet> \ No newline at end of file
diff --git a/build/win32/vs9/pango-version-paths.vsprops b/build/win32/vs9/pango-version-paths.vsprops
new file mode 100644
index 00000000..8555eaba
--- /dev/null
+++ b/build/win32/vs9/pango-version-paths.vsprops
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangoversionpathsprops"
+ >
+ <UserMacro
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRoot"
+ Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="CopyDir"
+ Value="$(GlibEtcInstallRoot)"
+ />
+ <UserMacro
+ Name="PangoApiVersion"
+ Value="1.0"
+ />
+ <UserMacro
+ Name="PangoLibtoolCompatibleDllPrefix"
+ Value="lib"
+ />
+ <UserMacro
+ Name="PangoLibtoolCompatibleDllSuffix"
+ Value="-$(PangoApiVersion)-0"
+ />
+ <UserMacro
+ Name="PangoSeparateVSDllPrefix"
+ Value=""
+ />
+ <UserMacro
+ Name="PangoSeparateVSDllSuffix"
+ Value="-1-vs$(VSVer)"
+ />
+ <!-- Change these two to PangoLibtoolCompatibleDllPrefix and
+ PangoLibtoolCompatibleDllSuffix if that is what you want -->
+ <UserMacro
+ Name="PangoDllPrefix"
+ Value="$(PangoSeparateVSDllPrefix)"
+ />
+ <UserMacro
+ Name="PangoDllSuffix"
+ Value="$(PangoSeparateVSDllSuffix)"
+ />
+</VisualStudioPropertySheet> \ No newline at end of file
diff --git a/build/win32/vs9/pango.vcprojin b/build/win32/vs9/pango.vcprojin
index bc70e3d6..c84c4382 100644
--- a/build/win32/vs9/pango.vcprojin
+++ b/build/win32/vs9/pango.vcprojin
@@ -20,7 +20,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-prebuild.vsprops;.\pango-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -51,9 +51,8 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-prebuild.vsprops;.\pango-build-defines.vsprops"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -81,7 +80,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-prebuild.vsprops;.\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -109,10 +108,9 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-prebuild.vsprops;.\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/build/win32/vs9/pango.vspropsin b/build/win32/vs9/pango.vspropsin
deleted file mode 100644
index f4f74f13..00000000
--- a/build/win32/vs9/pango.vspropsin
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="pangoprops"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2"
- PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES"
- ForcedIncludeFiles="msvc_recommended_pragmas.h"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
- AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
- />
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="
-if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\pango\DONE_MODULE_DEFS_H goto DONE_MODULE_DEFS_H&#x0D;&#x0A;
-copy /y ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\module-defs.h&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\DONE_MODULE_DEFS_H&#x0D;&#x0A;
-:DONE_MODULE_DEFS_H&#x0D;&#x0A;
-
-if exist ..\..\..\pango\DONE_MODULE_DEFS_LANG_C goto DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\module-defs-lang.c&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
-:DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
-
-if exist ..\..\..\pango\DONE_MODULE_DEFS_FC_C goto DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\module-defs-fc.c&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
-:DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
-
-if exist ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C goto DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\module-defs-win32.c&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
-:DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
-"
- />
- <UserMacro
- Name="VSVer"
- Value="9"
- />
- <UserMacro
- Name="GlibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
- />
- <UserMacro
- Name="CopyDir"
- Value="$(GlibEtcInstallRoot)"
- />
- <UserMacro
- Name="PangoApiVersion"
- Value="1.0"
- />
- <UserMacro
- Name="PangoBinaryVersion"
- Value="1.8.0"
- />
- <UserMacro
- Name="PangoDummyPrefix"
- Value="/dummy"
- />
- <UserMacro
- Name="PangoDefines"
- Value="G_LOG_DOMAIN=\&quot;Pango\&quot;;PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR=\&quot;$(PangoDummyPrefix)/etc\&quot;;LIBDIR=\&quot;$(PangoDummyPrefix)/lib\&quot;"
- />
- <UserMacro
- Name="NoFCDef"
- Value="PANGO_VISUALC_NO_FC"
- />
- <UserMacro
- Name="PangoLibtoolCompatibleDllPrefix"
- Value="lib"
- />
- <UserMacro
- Name="PangoLibtoolCompatibleDllSuffix"
- Value="-$(PangoApiVersion)-0"
- />
- <UserMacro
- Name="PangoSeparateVSDllPrefix"
- Value=""
- />
- <UserMacro
- Name="PangoSeparateVSDllSuffix"
- Value="-1-vs$(VSVer)"
- />
- <!-- Change these two to PangoLibtoolCompatibleDllPrefix and
- PangoLibtoolCompatibleDllSuffix if that is what you want -->
- <UserMacro
- Name="PangoDllPrefix"
- Value="$(PangoSeparateVSDllPrefix)"
- />
- <UserMacro
- Name="PangoDllSuffix"
- Value="$(PangoSeparateVSDllSuffix)"
- />
- <UserMacro
- Name="PangoInstallNoFC"
- Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
- "
- />
- <UserMacro
- Name="PangoDoInstall"
- Value="
-
-#include "pango.vs9.headers"
-copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-enum-types.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-
-if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango&#x0D;&#x0A;
-
-if exist $(CopyDir)\etc\pango\pango.aliases goto END&#x0D;&#x0A;
-echo tahoma = &quot;tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; > $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-echo sans = &quot;arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-echo serif = &quot;times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-echo monospace = &quot;courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-:END
-"
- />
- <UserMacro
- Name="PangoInstallFC"
- Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_FC&quot; goto installDbg&#x0D;&#x0A;
-copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix) $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)\Release\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)\Release\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-goto installFcDLLs&#x0D;&#x0A;
-
-:installDbg&#x0D;&#x0A;
-copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix) $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)\Debug\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)\Debug\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-:installFcDLLs&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-"
- />
- <UserMacro
- Name="DoGenGir"
- Value="
-set VSVER=$(VSVer)&#x0D;&#x0A;
-set CONF=$(ConfigurationName)&#x0D;&#x0A;
-set PLAT=$(PlatformName)&#x0D;&#x0A;
-set BASEDIR=$(GlibEtcInstallRoot)&#x0D;&#x0A;
-
-cd ..&#x0D;&#x0A;
-call gengir_pango.bat&#x0D;&#x0A;
-cd vs$(VSVer)&#x0D;&#x0A;
- "
- />
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin
index 3268c3cd..508072e3 100644
--- a/build/win32/vs9/pangocairo.vcprojin
+++ b/build/win32/vs9/pangocairo.vcprojin
@@ -20,7 +20,7 @@
<Configuration
Name="Debug_FC|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -53,7 +53,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops;.\pango-ignore-fc.vsprops"
CharacterSet="2"
>
<Tool
@@ -87,9 +87,8 @@
<Configuration
Name="Release_FC|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -120,9 +119,8 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops;.\pango-ignore-fc.vsprops"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -153,7 +151,7 @@
</Configuration>
<Configuration
Name="Debug_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -183,7 +181,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops;.\pango-ignore-fc.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -214,10 +212,9 @@
</Configuration>
<Configuration
Name="Release_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
@@ -244,10 +241,9 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops;.\pango-ignore-fc.vsprops"
ConfigurationType="2"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
index 92a9f53c..e4cdfa9e 100644
--- a/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@ -22,7 +22,7 @@
<Configuration
Name="Debug_FC|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -55,9 +55,8 @@
<Configuration
Name="Release_FC|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -87,7 +86,7 @@
</Configuration>
<Configuration
Name="Debug_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -117,10 +116,9 @@
</Configuration>
<Configuration
Name="Release_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/build/win32/vs9/pangowin32.vcproj b/build/win32/vs9/pangowin32.vcproj
index bff88520..b44ae7c1 100644
--- a/build/win32/vs9/pangowin32.vcproj
+++ b/build/win32/vs9/pangowin32.vcproj
@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -55,7 +55,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -86,7 +86,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -115,7 +115,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"