minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove native_app_glue linkage 

We don't provide android_main(), Minetest does. This also didn't even work correctly.
This commit is contained in:
sfan5 2023-06-04 19:40:54 +02:00
parent 510976f130
commit 2c6efbdf06
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Irrlicht/CMakeLists.txt
View File

@ -272,7 +272,6 @@ endif()
if(ANDROID) if(ANDROID)
enable_language(C) enable_language(C)
add_library(native_app_glue STATIC ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
elseif(APPLE) elseif(APPLE)
find_library(COCOA_LIB Cocoa REQUIRED) find_library(COCOA_LIB Cocoa REQUIRED)
find_library(IOKIT_LIB IOKit REQUIRED) find_library(IOKIT_LIB IOKit REQUIRED)
@ -314,7 +313,7 @@ set(link_libs
${OPENGLES2_LIBRARIES} ${OPENGLES2_LIBRARIES}
${EGL_LIBRARY} ${EGL_LIBRARY}
"$<$<PLATFORM_ID:Android>:native_app_glue -landroid -llog>" "$<$<PLATFORM_ID:Android>:-landroid -llog>"
${COCOA_LIB} ${COCOA_LIB}
${IOKIT_LIB} ${IOKIT_LIB}
"$<$<PLATFORM_ID:Windows>:gdi32>" "$<$<PLATFORM_ID:Windows>:gdi32>"
@ -541,13 +540,7 @@ if(WIN32)
endif() endif()
# Installation of library # Installation of library
if(ANDROID) install(TARGETS IrrlichtMt
set(INSTALL_TARGETS IrrlichtMt native_app_glue)
else()
set(INSTALL_TARGETS IrrlichtMt)
endif()
install(TARGETS ${INSTALL_TARGETS}
EXPORT IrrlichtMt-export EXPORT IrrlichtMt-export
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )