Skip to content
Snippets Groups Projects
Commit f1b8931e authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Add WITHOUT_JPEG_XL build option 

For those who want to force JPEG XL off, and don't use CMake
parent d5ebba93
No related branches found
No related tags found
No related merge requests found
Pipeline #7851 passed
Stage: build
Stage: test
Stage: cleanup
Hide whitespace changes
Inline Side-by-side
src/syncterm/GNUmakefile
+ 36
− 34
View file @ f1b8931e
...@@ -39,43 +39,45 @@ else ...@@ -39,43 +39,45 @@ else
CRYPT_LIBS += $(CRYPT_LIB) CRYPT_LIBS += $(CRYPT_LIB)
endif endif
ifdef win ifndef WITHOUT_JPEG_XL
CFLAGS += -I${3RDP_ROOT}/win32.release/libjxl/include -DJXL_THREADS_STATIC_DEFINE -DJXL_STATIC_DEFINE -DDLLIFY ifdef win
LDFLAGS += -L${3RDP_ROOT}/${os}.release/libjxl/lib -static-libstdc++ -static-libgcc CFLAGS += -I${3RDP_ROOT}/win32.release/libjxl/include -DJXL_THREADS_STATIC_DEFINE -DJXL_STATIC_DEFINE -DDLLIFY
EXTRA_LIBS += -ljxl LDFLAGS += -L${3RDP_ROOT}/${os}.release/libjxl/lib -static-libstdc++ -static-libgcc
EXTRA_LIBS += -ljxl_threads EXTRA_LIBS += -ljxl
EXTRA_LIBS += -lbrotlidec EXTRA_LIBS += -ljxl_threads
EXTRA_LIBS += -lbrotlicommon EXTRA_LIBS += -lbrotlidec
EXTRA_LIBS += -lhwy EXTRA_LIBS += -lbrotlicommon
EXTRA_LIBS += -mdll EXTRA_LIBS += -lhwy
CFLAGS += -DWITH_JPEG_XL -DWITH_STATIC_JXL EXTRA_LIBS += -mdll
CFLAGS += -DWITH_JPEG_XL_THREADS CFLAGS += -DWITH_JPEG_XL -DWITH_STATIC_JXL
OBJS += $(MTOBJODIR)$(DIRSEP)libjxl$(OFILE) CFLAGS += -DWITH_JPEG_XL_THREADS
OBJS += $(MTOBJODIR)$(DIRSEP)conn_conpty$(OFILE)
else
ifeq ($(shell pkg-config libjxl --exists && echo YES), YES)
CFLAGS += $(shell pkg-config libjxl --cflags)
EXTRA_LIBS += $(shell pkg-config libjxl --libs)
CFLAGS += -DWITH_JPEG_XL
OBJS += $(MTOBJODIR)$(DIRSEP)libjxl$(OFILE) OBJS += $(MTOBJODIR)$(DIRSEP)libjxl$(OFILE)
ifeq ($(shell pkg-config libjxl_threads --exists && echo YES), YES) OBJS += $(MTOBJODIR)$(DIRSEP)conn_conpty$(OFILE)
CFLAGS += $(shell pkg-config libjxl_threads --cflags)
EXTRA_LIBS += $(shell pkg-config libjxl_threads --libs)
CFLAGS += -DWITH_JPEG_XL_THREADS
endif
else else
# TODO: Add x86 libs too! ifeq ($(shell pkg-config libjxl --exists && echo YES), YES)
ifeq ($(os),darwin) CFLAGS += $(shell pkg-config libjxl --cflags)
CFLAGS += -I$(3RDP_ROOT)/$(os).release/libjxl/include -DJXL_THREADS_STATIC_DEFINE -DJXL_STATIC_DEFINE EXTRA_LIBS += $(shell pkg-config libjxl --libs)
LDFLAGS += -L$(3RDP_ROOT)/$(os).release/libjxl/lib CFLAGS += -DWITH_JPEG_XL
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) OBJS += $(MTOBJODIR)$(DIRSEP)libjxl$(OFILE)
ifeq ($(shell pkg-config libjxl_threads --exists && echo YES), YES)
CFLAGS += $(shell pkg-config libjxl_threads --cflags)
EXTRA_LIBS += $(shell pkg-config libjxl_threads --libs)
CFLAGS += -DWITH_JPEG_XL_THREADS
endif
else
# TODO: Add x86 libs too!
ifeq ($(os),darwin)
CFLAGS += -I$(3RDP_ROOT)/$(os).release/libjxl/include -DJXL_THREADS_STATIC_DEFINE -DJXL_STATIC_DEFINE
LDFLAGS += -L$(3RDP_ROOT)/$(os).release/libjxl/lib
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
endif endif
endif endif
endif endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment