From 8924ce733e3d85e44df4ac972eb0cd5b97cba714 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Tue, 8 May 2018 07:10:30 +0200
Subject: [PATCH] android example template, base as shared library

---
 android/examples/_template/CMakeLists.txt | 15 +++------------
 android/examples/base/CMakeLists.txt      | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 android/examples/base/CMakeLists.txt

diff --git a/android/examples/_template/CMakeLists.txt b/android/examples/_template/CMakeLists.txt
index 3e379c32..864494d7 100644
--- a/android/examples/_template/CMakeLists.txt
+++ b/android/examples/_template/CMakeLists.txt
@@ -5,25 +5,16 @@ set(NAME %EXAMPLE_FOLDER%)
 set(SRC_DIR ../../../examples/${NAME})
 set(BASE_DIR ../../../base)
 set(EXTERNAL_DIR ../../../external)
-set(LIB_DIR ../../../libs)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
 
 file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp")
-file(GLOB BASE_SRC "${BASE_DIR}/*.cpp")
 
-add_library(
-    native-lib SHARED
-    ${EXAMPLE_SRC}
-    ${BASE_SRC}
-    ${EXTERNAL_DIR}/imgui/imgui.cpp
-    ${EXTERNAL_DIR}/imgui/imgui_draw.cpp
-)
+add_library(native-lib SHARED ${EXAMPLE_SRC})
 
 add_library(native-app-glue STATIC ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
 
-add_library(libassimp STATIC IMPORTED)
-set_target_properties(libassimp PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/assimp/${ANDROID_ABI}/libassimp.a)
+add_subdirectory(../base ${CMAKE_SOURCE_DIR}/../base)
 
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 
@@ -37,8 +28,8 @@ include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 target_link_libraries(
     native-lib
     native-app-glue
+    libbase
     android
     log
     z
-    libassimp
 )
diff --git a/android/examples/base/CMakeLists.txt b/android/examples/base/CMakeLists.txt
new file mode 100644
index 00000000..4cc3c629
--- /dev/null
+++ b/android/examples/base/CMakeLists.txt
@@ -0,0 +1,21 @@
+file(GLOB BASE_SRC "../../../base/*.cpp" "../../../external/imgui/imgui.cpp" "../../../external/imgui/imgui_draw.cpp")
+
+add_library(libbase SHARED ${BASE_SRC})
+
+add_library(libassimp STATIC IMPORTED)
+set_target_properties(libassimp PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/assimp/${ANDROID_ABI}/libassimp.a)
+
+include_directories(${BASE_DIR})
+include_directories(../../../external/glm)
+include_directories(../../../external/gli)
+include_directories(../../../external/imgui)
+include_directories(../../../external/assimp)
+include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
+
+target_link_libraries(
+    libbase
+    android
+    log
+    z
+    libassimp    
+)