diff --git a/meson.build b/meson.build index 66c2554c..8f5b4528 100644 --- a/meson.build +++ b/meson.build @@ -45,13 +45,14 @@ if all_loaders or get_option('loaders').contains('jpg') == true config_h.set10('THORVG_JPG_LOADER_SUPPORT', true) endif +if all_loaders or get_option('loaders').contains('lottie') == true + config_h.set10('THORVG_LOTTIE_LOADER_SUPPORT', true) +endif + if get_option('loaders').contains('webp_beta') == true config_h.set10('THORVG_WEBP_LOADER_SUPPORT', true) endif -if get_option('loaders').contains('lottie_beta') == true - config_h.set10('THORVG_LOTTIE_LOADER_SUPPORT', true) -endif #Savers @@ -128,7 +129,7 @@ Summary: Loader (PNG): @8@ Loader (JPG): @9@ Loader (WEBP_BETA): @10@ - Loader (LOTTIE_BETA): @11@ + Loader (LOTTIE): @11@ Saver (TVG): @12@ Binding (CAPI): @13@ Binding (WASM_BETA): @14@ @@ -150,7 +151,7 @@ Summary: all_loaders or get_option('loaders').contains('png'), all_loaders or get_option('loaders').contains('jpg'), get_option('loaders').contains('webp_beta'), - get_option('loaders').contains('lottie_beta'), + all_loaders or get_option('loaders').contains('lottie'), all_savers or get_option('savers').contains('tvg'), get_option('bindings').contains('capi'), get_option('bindings').contains('wasm_beta'), diff --git a/meson_options.txt b/meson_options.txt index ff757cad..941274c7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,7 +6,7 @@ option('engines', option('loaders', type: 'array', - choices: ['', 'tvg', 'svg', 'png', 'jpg', 'webp_beta', 'lottie_beta', 'all'], + choices: ['', 'tvg', 'svg', 'png', 'jpg', 'webp_beta', 'lottie', 'all'], value: ['svg', 'tvg'], description: 'Enable File Loaders in thorvg ("all" does not include "*_beta".)') diff --git a/src/loaders/meson.build b/src/loaders/meson.build index deebd369..58b5008a 100644 --- a/src/loaders/meson.build +++ b/src/loaders/meson.build @@ -8,7 +8,7 @@ if all_loaders or get_option('loaders').contains('svg') == true subdir('svg') endif -if get_option('loaders').contains('lottie_beta') == true +if all_loaders or get_option('loaders').contains('lottie') == true subdir('lottie') endif diff --git a/wasm_build.sh b/wasm_build.sh index be25e723..5174c467 100755 --- a/wasm_build.sh +++ b/wasm_build.sh @@ -4,7 +4,7 @@ if [ ! -d "./build_wasm" ]; then sed "s|EMSDK:|$1|g" wasm_cross.txt > /tmp/.wasm_cross.txt - meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all, lottie_beta" -Dsavers="all" -Dbindings="wasm_beta" -Dlog=true --cross-file /tmp/.wasm_cross.txt build_wasm + meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all, lottie" -Dsavers="all" -Dbindings="wasm_beta" -Dlog=true --cross-file /tmp/.wasm_cross.txt build_wasm fi ninja -C build_wasm/