diff --git a/Makefile b/Makefile index 9244bc4..b48923b 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ ARCHIVE ?= $(PROJECT_BASENAME).$(TARGET_ARCH).7z DEPENDENCY_BUILD_DIRECTORY_LIBJXL := $(DEPENDENCY_BUILD_DIRECTORY)/libjxl -LIBJXL_LIBS += $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl_threads.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libhwy.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlicommon-static.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlidec-static.a +LIBJXL_LIBS += $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl_threads.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libhwy.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlicommon.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlidec.a SOURCES := extractor.c spi00in.c ifjxl.rc OBJECTS := $(SOURCES:.c=$(OBJECT_EXTENSION)) OBJECTS := $(OBJECTS:.cpp=$(OBJECT_EXTENSION)) @@ -161,12 +161,12 @@ DEPENDENCY_SOURCE_DIRECTORY_LIBJXL := $(DEPENDENCY_SOURCE_DIRECTORY)/libjxl DEPENDENCY_SOURCE_URL_LIBJXL := https://github.com/libjxl/libjxl.git $(DEPENDENCY_SOURCE_DIRECTORY_LIBJXL): | $(DEPENDENCY_SOURCE_DIRECTORY) - git clone --depth 1 --branch v0.8.2 --recursive --shallow-submodules $(DEPENDENCY_SOURCE_URL_LIBJXL) $@ + git clone --depth 1 --branch v0.9.0 --recursive --shallow-submodules $(DEPENDENCY_SOURCE_URL_LIBJXL) $@ $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl_threads.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libhwy.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a -$(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlicommon-static.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a -$(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlidec-static.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a +$(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlicommon.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a +$(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libbrotlidec.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a: | $(DEPENDENCY_SOURCE_DIRECTORY_LIBJXL) $(DEPENDENCY_OUTPUT_DIRECTORY) cmake \ @@ -195,7 +195,7 @@ $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a: | $(DEPENDENCY_SOURCE_DIRECTORY_LIB -DBUILD_TESTING=OFF \ -DJPEGXL_ENABLE_TOOLS=OFF \ -DJPEGXL_ENABLE_VIEWERS=OFF \ - -DJPEGXL_STATIC=ON \ + -DBUILD_SHARED_LIBS=OFF \ && \ cmake --build $(DEPENDENCY_BUILD_DIRECTORY_LIBJXL) && \ cmake --build $(DEPENDENCY_BUILD_DIRECTORY_LIBJXL) --target install