Skip to content

Commit 5786d2b

Browse files
committed
project: Update for 11.0.0 merge.
1 parent f4a9084 commit 5786d2b

File tree

5 files changed

+45
-66
lines changed

5 files changed

+45
-66
lines changed

.github/workflows/fontations.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

SMP/libharfbuzz.vcxproj.filters

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,12 @@
912912
<ClInclude Include="..\src\hb-decycler.hh">
913913
<Filter>Header Files\src</Filter>
914914
</ClInclude>
915+
<ClInclude Include="..\src\hb-bit-vector.hh">
916+
<Filter>Header Files\src</Filter>
917+
</ClInclude>
918+
<ClInclude Include="..\src\hb-directwrite.hh">
919+
<Filter>Header Files\src</Filter>
920+
</ClInclude>
915921
</ItemGroup>
916922
<ItemGroup>
917923
<ClCompile Include="..\src\hb-blob.cc">
@@ -1097,6 +1103,18 @@
10971103
<ClCompile Include="..\src\hb-subset-serialize.cc">
10981104
<Filter>Source Files\src</Filter>
10991105
</ClCompile>
1106+
<ClCompile Include="..\src\hb-directwrite-shape.cc">
1107+
<Filter>Source Files\src</Filter>
1108+
</ClCompile>
1109+
<ClCompile Include="..\src\hb-directwrite.cc">
1110+
<Filter>Source Files\src</Filter>
1111+
</ClCompile>
1112+
<ClCompile Include="..\src\hb-directwrite-font.cc">
1113+
<Filter>Source Files\src</Filter>
1114+
</ClCompile>
1115+
<ClCompile Include="..\src\hb-gdi.cc">
1116+
<Filter>Source Files\src</Filter>
1117+
</ClCompile>
11001118
</ItemGroup>
11011119
<ItemGroup>
11021120
<Text Include="readme.txt" />

SMP/libharfbuzz_files.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<ClInclude Include="..\src\hb-bit-page.hh" />
2323
<ClInclude Include="..\src\hb-bit-set.hh" />
2424
<ClInclude Include="..\src\hb-bit-set-invertible.hh" />
25+
<ClInclude Include="..\src\hb-bit-vector.hh" />
2526
<ClInclude Include="..\src\hb-blob.h" />
2627
<ClInclude Include="..\src\hb-blob.hh" />
2728
<ClInclude Include="..\src\hb-buffer-deserialize-json.hh" />
@@ -42,6 +43,7 @@
4243
<ClInclude Include="..\src\hb-decycler.hh" />
4344
<ClInclude Include="..\src\hb-deprecated.h" />
4445
<ClInclude Include="..\src\hb-directwrite.h" />
46+
<ClInclude Include="..\src\hb-directwrite.hh" />
4547
<ClInclude Include="..\src\hb-dispatch.hh" />
4648
<ClInclude Include="..\src\hb-draw.h" />
4749
<ClInclude Include="..\src\hb-draw.hh" />
@@ -288,12 +290,16 @@
288290
<ClCompile Include="..\src\hb-buffer-verify.cc" />
289291
<ClCompile Include="..\src\hb-buffer.cc" />
290292
<ClCompile Include="..\src\hb-common.cc" />
293+
<ClCompile Include="..\src\hb-directwrite.cc" />
294+
<ClCompile Include="..\src\hb-directwrite-font.cc" />
295+
<ClCompile Include="..\src\hb-directwrite-shape.cc" />
291296
<ClCompile Include="..\src\hb-draw.cc" />
292297
<ClCompile Include="..\src\hb-face.cc" />
293298
<ClCompile Include="..\src\hb-face-builder.cc" />
294299
<ClCompile Include="..\src\hb-fallback-shape.cc" />
295300
<ClCompile Include="..\src\hb-font.cc" />
296301
<ClCompile Include="..\src\hb-ft.cc" />
302+
<ClCompile Include="..\src\hb-gdi.cc" />
297303
<ClCompile Include="..\src\hb-map.cc" />
298304
<ClCompile Include="..\src\hb-number.cc" />
299305
<ClCompile Include="..\src\hb-ot-cff1-table.cc" />

SMP/libharfbuzz_winrt.vcxproj.filters

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,12 @@
912912
<ClInclude Include="..\src\hb-decycler.hh">
913913
<Filter>Header Files\src</Filter>
914914
</ClInclude>
915+
<ClInclude Include="..\src\hb-directwrite.hh">
916+
<Filter>Header Files\src</Filter>
917+
</ClInclude>
918+
<ClInclude Include="..\src\hb-bit-vector.hh">
919+
<Filter>Header Files\src</Filter>
920+
</ClInclude>
915921
</ItemGroup>
916922
<ItemGroup>
917923
<ClCompile Include="..\src\hb-blob.cc">
@@ -1097,6 +1103,18 @@
10971103
<ClCompile Include="..\src\hb-subset-serialize.cc">
10981104
<Filter>Source Files\src</Filter>
10991105
</ClCompile>
1106+
<ClCompile Include="..\src\hb-directwrite-shape.cc">
1107+
<Filter>Source Files\src</Filter>
1108+
</ClCompile>
1109+
<ClCompile Include="..\src\hb-directwrite.cc">
1110+
<Filter>Source Files\src</Filter>
1111+
</ClCompile>
1112+
<ClCompile Include="..\src\hb-directwrite-font.cc">
1113+
<Filter>Source Files\src</Filter>
1114+
</ClCompile>
1115+
<ClCompile Include="..\src\hb-gdi.cc">
1116+
<Filter>Source Files\src</Filter>
1117+
</ClCompile>
11001118
</ItemGroup>
11011119
<ItemGroup>
11021120
<Text Include="readme.txt" />

SMP/src/hb-features.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ HB_BEGIN_DECLS
4141
*
4242
* Defined if Harfbuzz has been built with cairo support.
4343
*/
44-
#mesondefine HB_HAS_CAIRO
44+
#undef HB_HAS_CAIRO
4545

4646
/**
4747
* HB_HAS_CORETEXT:
@@ -55,7 +55,7 @@ HB_BEGIN_DECLS
5555
*
5656
* Defined if Harfbuzz has been built with DirectWrite support.
5757
*/
58-
#undef HB_HAS_DIRECTWRITE
58+
#define HB_HAS_DIRECTWRITE 1
5959

6060
/**
6161
* HB_HAS_FREETYPE:
@@ -69,7 +69,7 @@ HB_BEGIN_DECLS
6969
*
7070
* Defined if Harfbuzz has been built with GDI support.
7171
*/
72-
#undef HB_HAS_GDI
72+
#define HB_HAS_GDI 1
7373

7474
/**
7575
* HB_HAS_GLIB:

0 commit comments

Comments
 (0)