Skip to content

Allow build libjpeg on Apple platforms and Emscripten #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeriyoshi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Allow build libjpeg on Apple platforms and Emscripten #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ea8f7d
Allow build libjpeg compat library on Apple platforms
zeriyoshi Mar 5, 2025
8bf256e
Allow build libjpeg compat library on Emscripten
zeriyoshi Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Gerhard Huber <support@pl32.com>
Galaxy4594 <164440799+Galaxy4594@users.noreply.github.com>
gi-man
Gilles Devillers (GilDev) <gildev@gmail.com>
Go Kudo <g-kudo@colopl.co.jp>
Heiko Becker <heirecka@exherbo.org>
Ivan Kokorev
Jim Robinson <jimbo2150@gmail.com>
Expand Down
19 changes: 13 additions & 6 deletions lib/jpegli.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ endif()
# Build libjpeg.so that links to libjpeg-static
#

if (JPEGXL_ENABLE_JPEGLI_LIBJPEG AND NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN)
if (JPEGXL_ENABLE_JPEGLI_LIBJPEG AND NOT WIN32)
add_library(jpegli-libjpeg-obj OBJECT "${JPEGXL_INTERNAL_JPEGLI_WRAPPER_SOURCES}")
target_compile_options(jpegli-libjpeg-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
target_compile_options(jpegli-libjpeg-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
Expand All @@ -130,12 +130,19 @@ set_target_properties(jpeg PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/jpegli"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/jpegli")

# Add a jpeg.version file as a version script to tag symbols with the
# Add a jpeg.version or jpeg.list file as a version script to tag symbols with the
# appropriate version number.
set_target_properties(jpeg PROPERTIES
LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION})
set_property(TARGET jpeg APPEND_STRING PROPERTY
LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}")
if (LINUX)
set_target_properties(jpeg PROPERTIES
LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION})
set_property(TARGET jpeg APPEND_STRING PROPERTY
LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}")
elseif(APPLE)
set_target_properties(jpeg PROPERTIES
LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.list.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION})
set_property(TARGET jpeg APPEND_STRING PROPERTY
LINK_FLAGS " -Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.list.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}")
endif()

if (JPEGXL_INSTALL_JPEGLI_LIBJPEG)
install(TARGETS jpeg
Expand Down
4 changes: 4 additions & 0 deletions lib/jpegli/jpeg.list.62
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_jpeg*
_tj*
_jpeg_mem_src*
_jpeg_mem_dest*
2 changes: 2 additions & 0 deletions lib/jpegli/jpeg.list.8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_jpeg*
_tj*