Merge 4315a31 into c494d7a

harfbuzz · Mar 11, 2020 · da67a31 · da67a31
2 parents c494d7a + 4315a31
commit da67a31
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -225,7 +225,9 @@ jobs:
       - checkout
       - run: apt update && apt install -y ninja-build binutils meson gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
       - run: pip install fonttools
-      - run: meson build && ninja -Cbuild test
+      - run: meson build && ninja -Cbuild test && rm -rf build
+      # test amalgam build
+      - run: meson build -Damalgam=true && ninja -Cbuild && rm -rf build
 
   crosscompile-notest-djgpp:
     docker:

diff --git a/meson_options.txt b/meson_options.txt
@@ -25,3 +25,6 @@ option('tests', type : 'feature', value : 'auto', yield : true,
   description: 'Enable or disable unit tests')
 option('introspection', type : 'feature', value : 'disabled', yield : true,
   description : 'Generate gobject-introspection bindings (.gir/.typelib files)')
+
+option('amalgam', type : 'boolean', value : false,
+  description : 'Enable amalgam builds')
diff --git a/src/meson.build b/src/meson.build
@@ -200,6 +200,11 @@ if conf.get('HAVE_CORETEXT', 0) == 1
   hb_headers += ['hb-coretext.h']
 endif
 
+if (get_option('amalgam'))
+  # replace the array if is amalgam build
+  hb_sources = ['harfbuzz.cc']
+endif
+
 # harfbuzz
 gen_def = find_program('gen-def.py')
 harfbuzz_def = custom_target('harfbuzz.def',