diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-12-03 17:18:30 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-12-03 17:18:30 +0800 |
commit | 9f2c369bd8a1a966b2c75bdf07c3fbb1e01f5c69 (patch) | |
tree | f8ef5ba033c17e63f33bde15b3d04c96d4528c84 /build | |
parent | 23ce626acc74c767add6fa6c43060727dbcc606f (diff) | |
download | pango-9f2c369bd8a1a966b2c75bdf07c3fbb1e01f5c69.tar.gz |
Split up the MSVC 2010 property sheets
Split up the property sheets so that their maintenance can be simplified
Diffstat (limited to 'build')
-rw-r--r-- | build/win32/vs10/Makefile.am | 15 | ||||
-rw-r--r-- | build/win32/vs10/gengir.vcxproj | 8 | ||||
-rw-r--r-- | build/win32/vs10/install.vcxproj | 32 | ||||
-rw-r--r-- | build/win32/vs10/pango-build-defines.props | 42 | ||||
-rw-r--r-- | build/win32/vs10/pango-gengir.props | 31 | ||||
-rw-r--r-- | build/win32/vs10/pango-ignore-fc.props | 26 | ||||
-rw-r--r-- | build/win32/vs10/pango-install-bin.props | 65 | ||||
-rw-r--r-- | build/win32/vs10/pango-install.propsin | 60 | ||||
-rw-r--r-- | build/win32/vs10/pango-prebuild.props | 53 | ||||
-rw-r--r-- | build/win32/vs10/pango-version-paths.props | 53 | ||||
-rw-r--r-- | build/win32/vs10/pango.vcxprojin | 12 | ||||
-rw-r--r-- | build/win32/vs10/pangocairo.vcxprojin | 16 | ||||
-rw-r--r-- | build/win32/vs10/pangoft2.vcxprojin | 8 | ||||
-rw-r--r-- | build/win32/vs10/pangowin32.vcxproj | 8 |
14 files changed, 371 insertions, 58 deletions
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 4626b4bd..cd174177 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,8 +1,13 @@ EXTRA_DIST = \ pango.sln \ - pango.propsin \ - pango.props \ + pango-build-defines.props \ + pango-gengir.props \ pango-ignore-fc.props \ + pango-install-bin.props \ + pango-install.props \ + pango-install.propsin \ + pango-prebuild.props \ + pango-version-paths.props \ pango.vcxproj \ pango.vcxproj.filters \ pango.vcxprojin \ @@ -21,10 +26,10 @@ EXTRA_DIST = \ gengir.vcxproj \ README.txt -pango.props: $(top_srcdir)/build/win32/vs10/pango.propsin pango.vs10.headers - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango.propsin >$@ +pango-install.props: $(top_srcdir)/build/win32/vs10/pango-install.propsin pango.vs10.headers + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango-install.propsin >$@ rm pango.vs10.headers -DISTCLEANFILES = pango.props +DISTCLEANFILES = pango-install.props -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj index 3c6859db..31305728 100644 --- a/build/win32/vs10/gengir.vcxproj +++ b/build/win32/vs10/gengir.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-gengir.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-gengir.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-gengir.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-gengir.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 4e8fc047..b8bab145 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -89,35 +89,35 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-install.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -140,42 +140,42 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'"> <PreBuildEvent> - <Command>$(PangoInstallFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PreBuildEvent> - <Command>$(PangoInstallNoFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'"> <PreBuildEvent> - <Command>$(PangoInstallFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PreBuildEvent> - <Command>$(PangoInstallNoFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'"> <PreBuildEvent> - <Command>$(PangoInstallFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PreBuildEvent> - <Command>$(PangoInstallNoFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'"> <PreBuildEvent> - <Command>$(PangoInstallFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PreBuildEvent> - <Command>$(PangoInstallNoFC) $(PangoDoInstall)</Command> + <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> diff --git a/build/win32/vs10/pango-build-defines.props b/build/win32/vs10/pango-build-defines.props new file mode 100644 index 00000000..b5b6d1f0 --- /dev/null +++ b/build/win32/vs10/pango-build-defines.props @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pango-version-paths.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <PangoBinaryVersion>1.8.0</PangoBinaryVersion>
+ <PangoDummyPrefix>/dummy</PangoDummyPrefix>
+ <PangoDefines>G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib"</PangoDefines>
+ <NoFCDef>PANGO_VISUALC_NO_FC</NoFCDef>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>pangobuilddefinesprops</_PropertySheetDisplayName>
+ <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+ <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="PangoBinaryVersion">
+ <Value>$(PangoBinaryVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="PangoDummyPrefix">
+ <Value>$(PangoDummyPrefix)</Value>
+ </BuildMacro>
+ <BuildMacro Include="PangoDefines">
+ <Value>$(PangoDefines)</Value>
+ </BuildMacro>
+ <BuildMacro Include="NoFCDef">
+ <Value>$(NoFCDef)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango-gengir.props b/build/win32/vs10/pango-gengir.props new file mode 100644 index 00000000..2050e98c --- /dev/null +++ b/build/win32/vs10/pango-gengir.props @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + <Import Project="pango-build-defines.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros"> +<DoGenGir> +set VSVER=$(VSVer) + +set CONF=$(Configuration) + +set PLAT=$(Platform) + +set BASEDIR=$(GlibEtcInstallRoot) + +cd .. + +call gengir_pango.bat + +cd vs$(VSVer) +</DoGenGir> + </PropertyGroup> + <PropertyGroup> + <_PropertySheetDisplayName>pangogengirprops</_PropertySheetDisplayName> + </PropertyGroup> + <ItemGroup> + <BuildMacro Include="DoGenGir"> + <Value>$(DoGenGir)</Value> + </BuildMacro> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango-ignore-fc.props b/build/win32/vs10/pango-ignore-fc.props index 53dc958a..adeb3635 100644 --- a/build/win32/vs10/pango-ignore-fc.props +++ b/build/win32/vs10/pango-ignore-fc.props @@ -1,14 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <_PropertySheetDisplayName>pangoignorefcprops</_PropertySheetDisplayName>
- </PropertyGroup>
- <ItemDefinitionGroup>
- <ProjectReference>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- </ProjectReference>
- <Link>
- <AdditionalDependencies>$(OutDir)\pangowin32-1.0.lib;$(OutDir)\pango-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <_PropertySheetDisplayName>pangoignorefcprops</_PropertySheetDisplayName> + </PropertyGroup> + <ItemDefinitionGroup> + <ProjectReference> + <LinkLibraryDependencies>false</LinkLibraryDependencies> + </ProjectReference> + <Link> + <AdditionalDependencies>$(OutDir)\pangowin32-1.0.lib;$(OutDir)\pango-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango-install-bin.props b/build/win32/vs10/pango-install-bin.props new file mode 100644 index 00000000..8a8ca733 --- /dev/null +++ b/build/win32/vs10/pango-install-bin.props @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + <Import Project="pango-build-defines.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros"> + <PangoDoInstallBin> +mkdir $(CopyDir)\bin + +mkdir $(CopyDir)\lib + + +if "$(Configuration)" == "Release_FC" goto DO_FC_BIN + +if "$(Configuration)" == "Debug_FC" goto DO_FC_BIN + + +copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\*-$(PangoApiVersion).lib $(CopyDir)\lib + +goto DONE_BIN + + +:DO_FC_BIN + +copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib + +copy $(Configuration)\$(Platform)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib + + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib + + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib + +:DONE_BIN + + </PangoDoInstallBin> + </PropertyGroup> + <PropertyGroup> + <_PropertySheetDisplayName>pangoinstallbinprops</_PropertySheetDisplayName> + </PropertyGroup> + <ItemGroup> + <BuildMacro Include="PangoDoInstallBin"> + <Value>$(PangoDoInstallBin)</Value> + </BuildMacro> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango-install.propsin b/build/win32/vs10/pango-install.propsin new file mode 100644 index 00000000..a7010cdd --- /dev/null +++ b/build/win32/vs10/pango-install.propsin @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + <Import Project="pango-install-bin.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros"> + <PangoInstallHeadersData> +#include "pango.vs10.headers" + +copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pango-enum-types.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + + +if "$(Configuration)" == "Release" goto DO_CREATE_PANGO_ALIASES + +if "$(Configuration)" == "Debug" goto DO_CREATE_PANGO_ALIASES + + +if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango + +copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + + +:DO_CREATE_PANGO_ALIASES + +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 + +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 +</PangoInstallHeadersData> + </PropertyGroup> + <PropertyGroup> + <_PropertySheetDisplayName>pangoinstallprops</_PropertySheetDisplayName> + </PropertyGroup> + <ItemDefinitionGroup> + </ItemDefinitionGroup> + <ItemGroup> + <BuildMacro Include="PangoInstallHeadersData"> + <Value>$(PangoInstallHeadersData)</Value> + </BuildMacro> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango-prebuild.props b/build/win32/vs10/pango-prebuild.props new file mode 100644 index 00000000..6a20a311 --- /dev/null +++ b/build/win32/vs10/pango-prebuild.props @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <_PropertySheetDisplayName>pangoprebuildprops</_PropertySheetDisplayName> + </PropertyGroup> + <ItemDefinitionGroup> + <PreBuildEvent> + <Command> +if exist ..\..\..\config.h goto DONE_CONFIG_H + +copy ..\..\..\config.h.win32 ..\..\..\config.h + +:DONE_CONFIG_H + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_H goto DONE_MODULE_DEFS_H + +copy /y ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\module-defs.h + +copy ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\DONE_MODULE_DEFS_H + +:DONE_MODULE_DEFS_H + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_LANG_C goto DONE_MODULE_DEFS_LANG_C + +copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\module-defs-lang.c + +copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_LANG_C + +:DONE_MODULE_DEFS_LANG_C + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_FC_C goto DONE_MODULE_DEFS_FC_C + +copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\module-defs-fc.c + +copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_FC_C + +:DONE_MODULE_DEFS_FC_C + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C goto DONE_MODULE_DEFS_WIN32_C + +copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\module-defs-win32.c + +copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C + +:DONE_MODULE_DEFS_WIN32_C + </Command> + </PreBuildEvent> + </ItemDefinitionGroup> +</Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango-version-paths.props b/build/win32/vs10/pango-version-paths.props new file mode 100644 index 00000000..8027f816 --- /dev/null +++ b/build/win32/vs10/pango-version-paths.props @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="UserMacros"> + <VSVer>10</VSVer> + <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> + <CopyDir>$(GlibEtcInstallRoot)</CopyDir> + <PangoApiVersion>1.0</PangoApiVersion> + <PangoLibtoolCompatibleDllPrefix>lib</PangoLibtoolCompatibleDllPrefix> + <PangoLibtoolCompatibleDllSuffix>-$(PangoApiVersion)-0</PangoLibtoolCompatibleDllSuffix> + <PangoSeparateVSDllPrefix /> + <PangoSeparateVSDllSuffix>-1-vs$(VSVer)</PangoSeparateVSDllSuffix> + <PangoDllPrefix>$(PangoSeparateVSDllPrefix)</PangoDllPrefix> + <PangoDllSuffix>$(PangoSeparateVSDllSuffix)</PangoDllSuffix> + </PropertyGroup> + <PropertyGroup> + <_PropertySheetDisplayName>pangoversionpathsprops</_PropertySheetDisplayName> + </PropertyGroup> + <ItemGroup> + <BuildMacro Include="VSVer"> + <Value>$(VSVer)</Value> + </BuildMacro> + <BuildMacro Include="GlibEtcInstallRoot"> + <Value>$(GlibEtcInstallRoot)</Value> + </BuildMacro> + <BuildMacro Include="GlibEtcInstallRootFromBuildWin32"> + <Value>$(GlibEtcInstallRootFromBuildWin32)</Value> + </BuildMacro> + <BuildMacro Include="CopyDir"> + <Value>$(CopyDir)</Value> + </BuildMacro> + <BuildMacro Include="PangoApiVersion"> + <Value>$(PangoApiVersion)</Value> + </BuildMacro> + <BuildMacro Include="PangoLibtoolCompatibleDllPrefix"> + <Value>$(PangoLibtoolCompatibleDllPrefix)</Value> + </BuildMacro> + <BuildMacro Include="PangoLibtoolCompatibleDllSuffix"> + <Value>$(PangoLibtoolCompatibleDllSuffix)</Value> + </BuildMacro> + <BuildMacro Include="PangoSeparateVSDllPrefix"> + <Value>$(PangoSeparateVSDllPrefix)</Value> + </BuildMacro> + <BuildMacro Include="PangoSeparateVSDllSuffix"> + <Value>$(PangoSeparateVSDllSuffix)</Value> + </BuildMacro> + <BuildMacro Include="PangoDllPrefix"> + <Value>$(PangoDllPrefix)</Value> + </BuildMacro> + <BuildMacro Include="PangoDllSuffix"> + <Value>$(PangoDllSuffix)</Value> + </BuildMacro> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/win32/vs10/pango.vcxprojin b/build/win32/vs10/pango.vcxprojin index 1b2b668b..e82a7ee4 100644 --- a/build/win32/vs10/pango.vcxprojin +++ b/build/win32/vs10/pango.vcxprojin @@ -51,19 +51,23 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> + <Import Project="pango-prebuild.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> + <Import Project="pango-prebuild.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> + <Import Project="pango-prebuild.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> + <Import Project="pango-prebuild.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin index e1bcd902..8f908adb 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/build/win32/vs10/pangocairo.vcxprojin @@ -89,39 +89,39 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> <Import Project="pango-ignore-fc.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> <Import Project="pango-ignore-fc.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> <Import Project="pango-ignore-fc.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> <Import Project="pango-ignore-fc.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin index c21f7dd5..d5eb457c 100644 --- a/build/win32/vs10/pangoft2.vcxprojin +++ b/build/win32/vs10/pangoft2.vcxprojin @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> diff --git a/build/win32/vs10/pangowin32.vcxproj b/build/win32/vs10/pangowin32.vcxproj index 5d981d58..cc4ab779 100644 --- a/build/win32/vs10/pangowin32.vcxproj +++ b/build/win32/vs10/pangowin32.vcxproj @@ -67,19 +67,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pango.props" /> + <Import Project="pango-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> |