diff --git a/3rdp/win64.release/libjxl/lib/libbrotlicommon.a b/3rdp/win64.release/libjxl/lib/libbrotlicommon.a index ec3ae344a385a8ce06b93f0774aa1e74d30ea98b..95b636be8b5bf02121a8b2205e9a60af4080698b 100644 Binary files a/3rdp/win64.release/libjxl/lib/libbrotlicommon.a and b/3rdp/win64.release/libjxl/lib/libbrotlicommon.a differ diff --git a/3rdp/win64.release/libjxl/lib/libbrotlidec.a b/3rdp/win64.release/libjxl/lib/libbrotlidec.a index c0c05ecb5dc7babf04970ab76920da75da128b4e..52284523cb7a94e0bb8aa8c4600dc47b76cf7705 100644 Binary files a/3rdp/win64.release/libjxl/lib/libbrotlidec.a and b/3rdp/win64.release/libjxl/lib/libbrotlidec.a differ diff --git a/3rdp/win64.release/libjxl/lib/libhwy.a b/3rdp/win64.release/libjxl/lib/libhwy.a index ca206258062728b0f6e0c6a5c7fe350a82e61dd5..ae26bf6007af4b7c3ffe215ab0a6b7129db45305 100644 Binary files a/3rdp/win64.release/libjxl/lib/libhwy.a and b/3rdp/win64.release/libjxl/lib/libhwy.a differ diff --git a/3rdp/win64.release/libjxl/lib/libjxl.a b/3rdp/win64.release/libjxl/lib/libjxl.a index 33688fc4ba5151ae470faceeed9f9f5cf5b4b3b0..4430d5e4226ab4b52aee28007a72d215cb430b2e 100644 Binary files a/3rdp/win64.release/libjxl/lib/libjxl.a and b/3rdp/win64.release/libjxl/lib/libjxl.a differ diff --git a/3rdp/win64.release/libjxl/lib/libjxl_threads.a b/3rdp/win64.release/libjxl/lib/libjxl_threads.a index c43be19821df2bc90a6b36fa9a8d9feecfb3d13a..b93df3adc348feaaf5e404d8d37f915a6a8057d3 100644 Binary files a/3rdp/win64.release/libjxl/lib/libjxl_threads.a and b/3rdp/win64.release/libjxl/lib/libjxl_threads.a differ diff --git a/src/syncterm/GNUmakefile b/src/syncterm/GNUmakefile index 6fcfdfd0c77f6047e194aeb587e3de7b8f8282c8..394da7c2516d09402466f102277abaf0fe066120 100644 --- a/src/syncterm/GNUmakefile +++ b/src/syncterm/GNUmakefile @@ -36,18 +36,16 @@ else endif ifdef win - ifeq (${os}, "win32") - CFLAGS += -I${3RDP_ROOT}/win32.release/libjxl/include -DJXL_THREADS_STATIC_DEFINE -DJXL_STATIC_DEFINE - LDFLAGS += -L${3RDP_ROOT}/${os}.release/libjxl/lib -static-libstdc++ -static-libgcc - EXTRA_LIBS += -ljxl - EXTRA_LIBS += -ljxl_threads - EXTRA_LIBS += -lbrotlidec - EXTRA_LIBS += -lbrotlicommon - EXTRA_LIBS += -lhwy - CFLAGS += -DWITH_JPEG_XL -DWITH_STATIC_JXL - CFLAGS += -DWITH_JPEG_XL_THREADS - OBJS += $(MTOBJODIR)$(DIRSEP)libjxl$(OFILE) - endif + CFLAGS += -I${3RDP_ROOT}/win32.release/libjxl/include -DJXL_THREADS_STATIC_DEFINE -DJXL_STATIC_DEFINE + LDFLAGS += -L${3RDP_ROOT}/${os}.release/libjxl/lib -static-libstdc++ -static-libgcc + EXTRA_LIBS += -ljxl + EXTRA_LIBS += -ljxl_threads + EXTRA_LIBS += -lbrotlidec + EXTRA_LIBS += -lbrotlicommon + EXTRA_LIBS += -lhwy + CFLAGS += -DWITH_JPEG_XL -DWITH_STATIC_JXL + CFLAGS += -DWITH_JPEG_XL_THREADS + OBJS += $(MTOBJODIR)$(DIRSEP)libjxl$(OFILE) else ifeq ($(shell pkg-config libjxl --exists && echo YES), YES) CFLAGS += $(shell pkg-config libjxl --cflags)