summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2024-03-17 21:41:08 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2024-03-17 21:41:08 +0000
commit634e0f5dd8edba941dbfa19f2483fde313b4a641 (patch)
tree2e8bb7cc3e51d8af61ceb2a9c21cab4b547e486d /Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build
parentc5d580adbdf22a09c4e387cd72e21236f41e3767 (diff)
harfbuzz 8.3.1
git-svn-id: svn://tug.org/texlive/trunk@70680 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build13
1 files changed, 8 insertions, 5 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build b/Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build
index 77c7e750178..daa9198058c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/meson.build
@@ -371,6 +371,8 @@ hb_subset_sources = files(
'hb-subset-cff2.cc',
'hb-subset-input.cc',
'hb-subset-input.hh',
+ 'hb-subset-instancer-iup.hh',
+ 'hb-subset-instancer-iup.cc',
'hb-subset-instancer-solver.hh',
'hb-subset-instancer-solver.cc',
'hb-subset-plan.cc',
@@ -680,7 +682,8 @@ if conf.get('HAVE_CAIRO', 0) == 1
endif
if get_option('tests').enabled()
- # TODO: MSVC gives the following,
+ # TODO: Microsoft LINK gives the following because extern, non dllexport
+ # symbols can only be used when linking against a static library
# error LNK2019: unresolved external symbol "unsigned __int64 const * const _hb_NullPool"
if cpp.get_define('_MSC_FULL_VER') == ''
noinst_programs = {
@@ -722,13 +725,13 @@ if get_option('tests').enabled()
'test-repacker': ['test-repacker.cc', 'hb-static.cc', 'graph/gsubgpos-context.cc'],
'test-instancer-solver': ['test-subset-instancer-solver.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
'test-priority-queue': ['test-priority-queue.cc', 'hb-static.cc'],
- 'test-tuple-varstore': ['test-tuple-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
- 'test-item-varstore': ['test-item-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
+ 'test-tuple-varstore': ['test-tuple-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-subset-instancer-iup.cc', 'hb-static.cc'],
+ 'test-item-varstore': ['test-item-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-subset-instancer-iup.cc', 'hb-static.cc'],
'test-unicode-ranges': ['test-unicode-ranges.cc'],
}
foreach name, source : compiled_tests
- if cpp.get_argument_syntax() == 'msvc' and source.contains('hb-static.cc')
- # TODO: MSVC doesn't like tests having hb-static.cc, fix them
+ if cpp.get_define('_MSC_FULL_VER') != '' and source.contains('hb-static.cc')
+ # TODO: Microsoft compilers cannot link tests using hb-static.cc, fix them
continue
endif
test(name, executable(name, source,