summaryrefslogtreecommitdiff
path: root/build/win32
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2012-08-16 20:51:57 -0400
committerBehdad Esfahbod <behdad@behdad.org>2012-08-16 21:10:10 -0400
commit8168660e5f1906aed2a45d30529058f51473bcef (patch)
tree8c5a9172672404c0f85bc78f3ba31a566cb52aba /build/win32
parentfeff5a6e2682048a07a6ba09af83254e290bf394 (diff)
parent656d473b52e3edea621c0681d2ba14363f257e84 (diff)
downloadpango-8168660e5f1906aed2a45d30529058f51473bcef.tar.gz
Merge branch 'harfbuzz-ng-external'
Conflicts: configure.in docs/tmpl/text-attributes.sgml modules/arabic/arabic-ot.c modules/indic/indic-ot.c pango/opentype/Makefile.am pango/opentype/hb-blob.c pango/opentype/hb-buffer-private.h pango/opentype/hb-common.h pango/opentype/hb-ot-layout-gsubgpos-private.hh pango/opentype/hb-private.h pango/pango-ot-info.c
Diffstat (limited to 'build/win32')
-rw-r--r--build/win32/vs10/pangoft2.vcxproj.filtersin1
-rw-r--r--build/win32/vs10/pangoft2.vcxprojin1
-rw-r--r--build/win32/vs9/pangoft2.vcprojin1
3 files changed, 0 insertions, 3 deletions
diff --git a/build/win32/vs10/pangoft2.vcxproj.filtersin b/build/win32/vs10/pangoft2.vcxproj.filtersin
index 444ae58a..bd1b8d6e 100644
--- a/build/win32/vs10/pangoft2.vcxproj.filtersin
+++ b/build/win32/vs10/pangoft2.vcxproj.filtersin
@@ -35,7 +35,6 @@
<ClCompile Include="..\..\..\modules\thai\thai-fc.c"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\..\..\modules\thai\thai-shaper.c"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\..\..\modules\tibetan\tibetan-fc.c"><Filter>Source Files</Filter></ClCompile>
-#include "opentype/libharfbuzz.vs10.sourcefiles.filters"
#include "libpangoft2.vs10.sourcefiles.filters"
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin
index 3d7c73cc..320c9bb7 100644
--- a/build/win32/vs10/pangoft2.vcxprojin
+++ b/build/win32/vs10/pangoft2.vcxprojin
@@ -223,7 +223,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_tibetan_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_tibetan_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
-#include "opentype/libharfbuzz.vs10.sourcefiles"
#include "libpangoft2.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
index 151c203e..9bfa2c27 100644
--- a/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@ -230,7 +230,6 @@
<FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
<FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
</File>
-#include "opentype/libharfbuzz.sourcefiles"
#include "libpangoft2.sourcefiles"
</Filter>
</Files>