diff --git a/Makefile b/Makefile index 50976d6a..8c97d292 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ WASM_BUILD := $(BUILD)/$(WASM) EMSDK := emsdk EMSDK_DIR := $(PROJECT_DIR)/$(DEPS_MODULES_DIR)/$(EMSDK) -EMSDK_VERSION := 3.1.71 +EMSDK_VERSION := 3.1.73 EMSDK_ENV := emsdk_env.sh UNIFFI_BINDGEN_CPP := uniffi-bindgen-cpp @@ -329,6 +329,7 @@ define SETUP_MESON -Dthreads=false \ -Dstatic=$(STATIC) \ -Dextra=$(EXTRA) \ + -Dfile=$(FILE) \ $(CROSS_FILE) "$(THORVG_DEP_SOURCE_DIR)" "$(THORVG_DEP_BUILD_DIR)" endef @@ -615,13 +616,14 @@ endef define NEW_THORVG_BUILD # Setup meson for thorvg -$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): export PKG_CONFIG_PATH := $(PWD)/$$($1_DEPS_LIB_DIR)/pkgconfig:$(PWD)/$$($1_DEPS_LIB64_DIR)/pkgconfig +$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): export PKG_CONFIG_PATH := $(PWD)/$$($1_DEPS_LIB_DIR)/pkgconfig:$(PWD)/$$($1_DEPS_LIB64_DIR) $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): THORVG_DEP_SOURCE_DIR := $(DEPS_MODULES_DIR)/$(THORVG) $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): THORVG_DEP_BUILD_DIR := $$($1_THORVG_DEP_BUILD_DIR) $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): CROSS_FILE := --cross-file $$($1_THORVG_DEP_BUILD_DIR)/../$(MESON_CROSS_FILE) $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): LOG := false $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): STATIC := $3 $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): EXTRA := $4 +$$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): FILE := $5 $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_THORVG_DEP_BUILD_DIR)/../$(MESON_CROSS_FILE) $(if $(filter $3,false), $$($1_THORVG_DEP_BUILD_DIR)/$(NINJA_BUILD_FILE): $$($1_DEPS_LIB_DIR)/$(LIBJPEG_TURBO_LIB) @@ -643,7 +645,7 @@ $(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,LIBPNG_LIB,$(LIBPNG),$$($1_LIBPNG_DEP_B $(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,ZLIB,$(ZLIB),$$($1_ZLIB_DEP_BUILD_DIR),$(ZLIB_LIB))) $(eval $(call NEW_ANDROID_CMAKE_BUILD,$1,WEBP,$(WEBP),$$($1_WEBP_DEP_BUILD_DIR),$(WEBP_LIB))) $(eval $(call NEW_ANDROID_CROSS_FILE,$1)) -$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions")) +$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions",true)) endef define NEW_APPLE_DEPS_BUILD @@ -652,12 +654,12 @@ $(eval $(call NEW_APPLE_CMAKE_BUILD,$1,LIBPNG_LIB,$(LIBPNG),$$($1_LIBPNG_DEP_BUI $(eval $(call NEW_APPLE_CMAKE_BUILD,$1,ZLIB,$(ZLIB),$$($1_ZLIB_DEP_BUILD_DIR),$(ZLIB_LIB))) $(eval $(call NEW_APPLE_CMAKE_BUILD,$1,WEBP,$(WEBP),$$($1_WEBP_DEP_BUILD_DIR),$(WEBP_LIB))) $(eval $(call NEW_APPLE_CROSS_FILE,$1)) -$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions")) +$(eval $(call NEW_THORVG_BUILD,$1,false,false,"lottie_expressions",true)) endef define NEW_WASM_DEPS_BUILD $(eval $(call NEW_WASM_CROSS_FILE,$1,$$($1_THORVG_DEP_BUILD_DIR)/..,windows)) -$(eval $(call NEW_THORVG_BUILD,$1,false,true,"lottie_expressions")) +$(eval $(call NEW_THORVG_BUILD,$1,false,true,"lottie_expressions",false)) endef define NEW_ANDROID_BUILD @@ -823,6 +825,7 @@ $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): THORVG_DEP_BUILD_DIR := $(TH $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): LOG := false $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): STATIC := false $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): EXTRA := lottie_expressions +$(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): FILE := true $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(LIBJPEG_TURBO_LIB) $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(LIBPNG_LIB) $(THORVG_LOCAL_ARCH_BUILD_DIR)/$(NINJA_BUILD_FILE): $(LOCAL_ARCH_LIB_DIR)/$(ZLIB_LIB) diff --git a/deps/modules/emsdk b/deps/modules/emsdk index 59108b0e..6abe5123 160000 --- a/deps/modules/emsdk +++ b/deps/modules/emsdk @@ -1 +1 @@ -Subproject commit 59108b0e222d4c38530a5f2bebcecc7db965f52d +Subproject commit 6abe5123c34a7751a2d5b679e856b2591ba04145 diff --git a/deps/modules/thorvg b/deps/modules/thorvg index 89ab573a..52cf31a7 160000 --- a/deps/modules/thorvg +++ b/deps/modules/thorvg @@ -1 +1 @@ -Subproject commit 89ab573acb253567975b2494069c7ee9abc9267c +Subproject commit 52cf31a79d27e1b2141f2a732130c0b07d158615 diff --git a/dotlottie-ffi/src/lib.rs b/dotlottie-ffi/src/lib.rs index 80ab3014..a0014e2c 100644 --- a/dotlottie-ffi/src/lib.rs +++ b/dotlottie-ffi/src/lib.rs @@ -1,3 +1,6 @@ +// hint: this is a workaround as the generated code from uniffi has empty lines after doc comments +#![allow(clippy::empty_line_after_doc_comments)] + pub use dotlottie_rs::*; mod ffi;