diff --git a/codecs/jxl/Makefile b/codecs/jxl/Makefile index 9a056d7c5..37a4a0e86 100644 --- a/codecs/jxl/Makefile +++ b/codecs/jxl/Makefile @@ -6,7 +6,7 @@ CODEC_MT_BUILD_DIR := $(CODEC_BUILD_ROOT)/mt CODEC_MT_SIMD_BUILD_DIR := $(CODEC_BUILD_ROOT)/mt-simd ENVIRONMENT = worker -OUT_JS = enc/jxl_enc.js enc/jxl_enc_mt.js enc/jxl_enc_mt_simd.js dec/jxl_dec.js enc/jxl_node_enc.js dec/jxl_node_dec.js +OUT_JS = enc/jxl_enc.js enc/jxl_enc_mt.js enc/jxl_enc_mt_simd.js dec/jxl_dec.js OUT_WASM = $(OUT_JS:.js=.wasm) OUT_WORKER = $(OUT_JS:.js=.worker.js) @@ -18,13 +18,11 @@ all: $(OUT_JS) $(filter enc/%,$(OUT_JS)): enc/jxl_enc.cpp $(filter dec/%,$(OUT_JS)): dec/jxl_dec.cpp -enc/jxl_node_enc.js dec/jxl_node_dec.js: ENVIRONMENT = node - # For single-threaded build, we compile with threads enabled, but then just don't use them nor link them in. -enc/jxl_enc.js enc/jxl_node_enc.js enc/jxl_enc_mt.js dec/jxl_dec.js dec/jxl_node_dec.js: CODEC_BUILD_DIR:=$(CODEC_MT_BUILD_DIR) +enc/jxl_enc.js enc/jxl_enc_mt.js dec/jxl_dec.js: CODEC_BUILD_DIR:=$(CODEC_MT_BUILD_DIR) enc/jxl_enc_mt_simd.js: CODEC_BUILD_DIR:=$(CODEC_MT_SIMD_BUILD_DIR) -enc/jxl_node_enc.js dec/jxl_node_dec.js enc/jxl_enc.js dec/jxl_dec.js: $(CODEC_MT_BUILD_DIR)/lib/libjxl.a +enc/jxl_enc.js dec/jxl_dec.js: $(CODEC_MT_BUILD_DIR)/lib/libjxl.a enc/jxl_enc_mt.js: $(CODEC_MT_BUILD_DIR)/lib/libjxl.a $(CODEC_MT_BUILD_DIR)/lib/libjxl_threads.a enc/jxl_enc_mt_simd.js: $(CODEC_MT_SIMD_BUILD_DIR)/lib/libjxl.a $(CODEC_MT_SIMD_BUILD_DIR)/lib/libjxl_threads.a @@ -33,7 +31,7 @@ enc/jxl_enc_mt_simd.js: $(CODEC_MT_SIMD_BUILD_DIR)/lib/libjxl.a $(CODEC_MT_SIMD_ export CXXFLAGS += -Wno-deprecated-declarations # Compile multithreaded wrappers with -pthread. -enc/jxl_enc_mt.js enc/jxl_enc_mt_simd.js dec/jxl_dec.js: CXXFLAGS+=-pthread +enc/jxl_enc_mt.js enc/jxl_enc_mt_simd.js: CXXFLAGS+=-pthread $(OUT_JS): $(CXX) \