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

Don't link with libraries we run-time link :(

parent f1b8931e
No related branches found
No related tags found
No related merge requests found
Pipeline #7852 passed
......@@ -142,16 +142,10 @@ if(NOT WITHOUT_JPEG_XL)
target_compile_definitions(syncterm PUBLIC WITH_JPEG_XL)
target_include_directories(syncterm PRIVATE ${JPEG_XL_INCLUDE_DIRS})
target_compile_options(syncterm PRIVATE ${JPEG_XL_CFLAGS})
target_link_directories(syncterm PRIVATE ${JPEG_XL_LIBRARY_DIRS})
target_link_libraries(syncterm ${JPEG_XL_LIBRARIES})
target_link_options(syncterm PRIVATE ${JPEG_XL_LDFLAGS})
if(JPEG_XL_THREADS_FOUND)
target_compile_definitions(syncterm PUBLIC WITH_JPEG_XL_THREADS)
target_include_directories(syncterm PRIVATE ${JPEG_XL_THREADS_INCLUDE_DIRS})
target_compile_options(syncterm PRIVATE ${JPEG_XL_THREADS_CFLAGS})
target_link_directories(syncterm PRIVATE ${JPEG_XL_THREADS_LIBRARY_DIRS})
target_link_libraries(syncterm ${JPEG_XL_THREADS_LIBRARIES})
target_link_options(syncterm PRIVATE ${JPEG_XL_THREADS_LDFLAGS})
endif()
endif()
endif()
......
......@@ -56,16 +56,13 @@ ifndef WITHOUT_JPEG_XL
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)
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment