Skip to content

Commit 0d4f4b6

Browse files
committed
Add heaps-android-app submodule and fix CMakeLists.txt for libjpeg-turbo build custom command and SDL2main library
1 parent 40d9699 commit 0d4f4b6

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
[submodule "openal-soft"]
1212
path = openal-soft
1313
url = https://github.com/kcat/openal-soft.git
14+
[submodule "heaps-android-app"]
15+
path = heaps-android-app
16+
url = https://github.com/rtissera/heaps-android-app.git

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ target_link_libraries(hl log)
2828
set(TJ_LIB ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/obj/local/${ANDROID_ABI}/libjpeg-turbo.a)
2929
add_custom_target(turbojpeg
3030
${ANDROID_NDK}/ndk-build APP_ABI=${ANDROID_ABI} APP_PLATFORM=${ANDROID_PLATFORM}
31-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo
31+
NDK_PROJECT_PATH=./libjpeg-turbo
32+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
3233
BYPRODUCTS ${TJ_LIB}
3334
)
3435

@@ -65,7 +66,7 @@ add_subdirectory(sdl2)
6566
file(GLOB sdl hashlink/libs/sdl/*.c)
6667
add_library(sdl.hdll STATIC ${sdl})
6768
target_include_directories(sdl.hdll PUBLIC sdl2/include)
68-
target_link_libraries(sdl.hdll SDL2 EGL GLESv3)
69+
target_link_libraries(sdl.hdll SDL2 SDL2main EGL GLESv3)
6970

7071
# OpenAL
7172

heaps-android-app

Submodule heaps-android-app added at 698bf85

0 commit comments

Comments
 (0)