From 261c57355744c52484dc4af0332752ded2fc8812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 11 Sep 2016 23:39:24 +0200 Subject: [PATCH] Platform: build Android glue C source separately. So I don't include the pedantic flags for it and don't treat it as C++ source. --- src/Magnum/Platform/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 7cef63b75..b48883ac8 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -70,15 +70,19 @@ if(WITH_ANDROIDAPPLICATION) set(MagnumAndroidApplication_PRIVATE_HEADERS Implementation/Egl.h) + add_library(MagnumAndroidApplicationGlue OBJECT + ${ANDROID_NATIVE_APP_GLUE_SRC}) + set_target_properties(MagnumAndroidApplicationGlue PROPERTIES CORRADE_USE_PEDANTIC_FLAGS OFF) + target_compile_options(MagnumAndroidApplicationGlue PRIVATE "-fvisibility=default") + add_library(MagnumAndroidApplication STATIC ${MagnumAndroidApplication_SRCS} ${MagnumAndroidApplication_HEADERS} ${MagnumAndroidApplication_PRIVATE_HEADERS} - ${ANDROID_NATIVE_APP_GLUE_SRC}) + $) # They just don't care, so of course the ANativeActivity_onCreate() # function is not exported and thus the app startup fails if I don't # disable hidden visibility for the file. - set_source_files_properties(${ANDROID_NATIVE_APP_GLUE_SRC} PROPERTIES COMPILE_FLAGS "-fvisibility=default") target_include_directories(MagnumAndroidApplication PUBLIC ${ANDROID_NATIVE_APP_GLUE_INCLUDE_DIR}) set_target_properties(MagnumAndroidApplication PROPERTIES DEBUG_POSTFIX "-d") # Assuming that PIC is not needed because the Application lib is always