From 2c6efbdf06449e042d4b5a15b4d5cd369c4be1d4 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 4 Jun 2023 19:40:54 +0200 Subject: [PATCH] Remove native_app_glue linkage We don't provide android_main(), Minetest does. This also didn't even work correctly. --- source/Irrlicht/CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt index 90c42994..82971d98 100644 --- a/source/Irrlicht/CMakeLists.txt +++ b/source/Irrlicht/CMakeLists.txt @@ -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) @@ -314,7 +313,7 @@ set(link_libs ${OPENGLES2_LIBRARIES} ${EGL_LIBRARY} - "$<$:native_app_glue -landroid -llog>" + "$<$:-landroid -llog>" ${COCOA_LIB} ${IOKIT_LIB} "$<$:gdi32>" @@ -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}" )