From 18fe29478c263cf57ed408b153a76f30a934261d Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 8 Oct 2015 18:36:05 +0800 Subject: MSVC builds: Update PangoFT2-related items Fix the projects, and consolidate repeated items into the property sheets, as they now need to compile and link against HarfBuzz. Also remove unnecessary lines from the PangoFT2 and PangoCairo project files. --- build/win32/vs10/pango-build-defines.props | 10 +++++++++- build/win32/vs10/pangocairo.vcxprojin | 16 ++++------------ build/win32/vs10/pangoft2.vcxprojin | 24 ++++++++++++------------ build/win32/vs9/pango-build-defines.vsprops | 14 +++++++++++++- build/win32/vs9/pangocairo.vcprojin | 25 +++++++++---------------- build/win32/vs9/pangoft2.vcprojin | 24 ++++++++++++------------ 6 files changed, 59 insertions(+), 54 deletions(-) diff --git a/build/win32/vs10/pango-build-defines.props b/build/win32/vs10/pango-build-defines.props index cc55e955..89b8b9ab 100644 --- a/build/win32/vs10/pango-build-defines.props +++ b/build/win32/vs10/pango-build-defines.props @@ -8,6 +8,8 @@ /dummy G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib" PANGO_VISUALC_NO_FC + ..;$(GlibEtcInstallRoot)\include\harfbuzz + fontconfig.lib;freetype.lib;harfbuzz.lib <_PropertySheetDisplayName>pangobuilddefinesprops @@ -41,5 +43,11 @@ $(NoFCDef) + + $(PangoFT2Incs) + + + $(PangoFT2Libs) + - \ No newline at end of file + diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin index 3ce0effc..304cb0d2 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/build/win32/vs10/pangocairo.vcxprojin @@ -137,7 +137,6 @@ Disabled - .;%(AdditionalIncludeDirectories) _DEBUG;$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions) true EnableFastChecks @@ -160,7 +159,6 @@ - .;%(AdditionalIncludeDirectories) $(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions) MultiThreadedDLL @@ -184,7 +182,6 @@ Disabled - .;%(AdditionalIncludeDirectories) _DEBUG;$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions) true EnableFastChecks @@ -207,7 +204,6 @@ - .;%(AdditionalIncludeDirectories) $(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions) MultiThreadedDLL @@ -230,7 +226,6 @@ Disabled - .;%(AdditionalIncludeDirectories) _DEBUG;$(PangoDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -241,7 +236,7 @@ EditAndContinue - cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies) + cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangocairo.def true @@ -252,7 +247,6 @@ - .;%(AdditionalIncludeDirectories) $(PangoDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -261,7 +255,7 @@ ProgramDatabase - cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies) + cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangocairo.def true @@ -275,7 +269,6 @@ Disabled - .;%(AdditionalIncludeDirectories) _DEBUG;$(PangoDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -286,7 +279,7 @@ ProgramDatabase - cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies) + cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangocairo.def true @@ -297,7 +290,6 @@ - .;%(AdditionalIncludeDirectories) $(PangoDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -306,7 +298,7 @@ ProgramDatabase - cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies) + cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangocairo.def true diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin index d1b57868..802b4977 100644 --- a/build/win32/vs10/pangoft2.vcxprojin +++ b/build/win32/vs10/pangoft2.vcxprojin @@ -75,8 +75,8 @@ Disabled - ..\;%(AdditionalIncludeDirectories) - _DEBUG;$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions) + $(PangoFT2Incs);%(AdditionalIncludeDirectories) + _DEBUG;$(PangoDefines);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -86,7 +86,7 @@ EditAndContinue - fontconfig.lib;freetype.lib;%(AdditionalDependencies) + $(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangoft2.def true @@ -97,8 +97,8 @@ - ..\;%(AdditionalIncludeDirectories) - $(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions) + $(PangoFT2Incs);%(AdditionalIncludeDirectories) + $(PangoDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -106,7 +106,7 @@ ProgramDatabase - fontconfig.lib;freetype.lib;%(AdditionalDependencies) + $(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangoft2.def true @@ -120,8 +120,8 @@ Disabled - ..\;%(AdditionalIncludeDirectories) - _DEBUG;$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions) + $(PangoFT2Incs);%(AdditionalIncludeDirectories) + _DEBUG;$(PangoDefines);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -131,7 +131,7 @@ ProgramDatabase - fontconfig.lib;freetype.lib;%(AdditionalDependencies) + $(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangoft2.def true @@ -142,8 +142,8 @@ - ..\;%(AdditionalIncludeDirectories) - $(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions) + $(PangoFT2Incs);%(AdditionalIncludeDirectories) + $(PangoDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -151,7 +151,7 @@ ProgramDatabase - fontconfig.lib;freetype.lib;%(AdditionalDependencies) + $(PangoFT2Libs);%(AdditionalDependencies) $(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll ..\..\..\pango\pangoft2.def true diff --git a/build/win32/vs9/pango-build-defines.vsprops b/build/win32/vs9/pango-build-defines.vsprops index 7eeac94b..ed892a79 100644 --- a/build/win32/vs9/pango-build-defines.vsprops +++ b/build/win32/vs9/pango-build-defines.vsprops @@ -35,4 +35,16 @@ Name="NoFCDef" Value="PANGO_VISUALC_NO_FC" /> - \ No newline at end of file + + + + diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin index 3ee818dc..e4b32729 100644 --- a/build/win32/vs9/pangocairo.vcprojin +++ b/build/win32/vs9/pangocairo.vcprojin @@ -29,7 +29,7 @@ - - +