Skip to content

Commit 20e3992

Browse files
committed
added jpeg-turbo support
1 parent 14ba9b8 commit 20e3992

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
path = sdl2
66
url = https://github.com/spurious/SDL-mirror.git
77
branch = release-2.0.8
8+
[submodule "libjpeg-turbo"]
9+
path = libjpeg-turbo
10+
url = https://github.com/openstf/android-libjpeg-turbo.git

CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ target_link_libraries(hl log)
2525

2626
# FMT
2727

28+
add_custom_target(turbojpeg ${ANDROID_NDK}/ndk-build APP_ABI=armeabi-v7a WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo)
29+
2830
file(GLOB fmt hashlink/libs/fmt/*.c)
2931
file(GLOB png hashlink/include/png/*.c)
3032
file(GLOB zlib hashlink/include/zlib/*.c)
@@ -41,11 +43,16 @@ add_library(fmt.hdll STATIC
4143
${mikkt}
4244
)
4345

46+
add_dependencies(fmt.hdll turbojpeg)
47+
48+
file(GLOB tj_include libjpeg-turbo/jni/vendor/libjpeg-turbo/libjpeg-turbo-*)
49+
4450
target_include_directories(fmt.hdll PRIVATE
4551
hashlink/include/png
4652
hashlink/include/mikktspace
4753
hashlink/include/vorbis
4854
hashlink/include/zlib
55+
${tj_include}
4956
)
5057

5158
# SDL

libjpeg-turbo

Submodule libjpeg-turbo added at 46be77d

0 commit comments

Comments
 (0)