Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
Remove native_app_glue linkage
Browse files Browse the repository at this point in the history
We don't provide android_main(), Minetest does. This also didn't even work correctly.
  • Loading branch information
sfan5 committed Jun 4, 2023
1 parent 510976f commit 2c6efbd
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions source/Irrlicht/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ endif()

if(ANDROID)
enable_language(C)
add_library(native_app_glue STATIC ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
elseif(APPLE)
find_library(COCOA_LIB Cocoa REQUIRED)
find_library(IOKIT_LIB IOKit REQUIRED)
Expand Down Expand Up @@ -314,7 +313,7 @@ set(link_libs
${OPENGLES2_LIBRARIES}
${EGL_LIBRARY}

"$<$<PLATFORM_ID:Android>:native_app_glue -landroid -llog>"
"$<$<PLATFORM_ID:Android>:-landroid -llog>"
${COCOA_LIB}
${IOKIT_LIB}
"$<$<PLATFORM_ID:Windows>:gdi32>"
Expand Down Expand Up @@ -541,13 +540,7 @@ if(WIN32)
endif()

# Installation of library
if(ANDROID)
set(INSTALL_TARGETS IrrlichtMt native_app_glue)
else()
set(INSTALL_TARGETS IrrlichtMt)
endif()

install(TARGETS ${INSTALL_TARGETS}
install(TARGETS IrrlichtMt
EXPORT IrrlichtMt-export
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)

0 comments on commit 2c6efbd

Please sign in to comment.