From 2f0e45e7a7110761080e2540c95a9fc94f162f81 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <git@matthiasm.com>
Date: Thu, 17 Jan 2019 21:29:24 +0100
Subject: Android CMake: icons, docs, more apps

---
 CMake/Android/CMakeList.txt.in       |  24 +++++++++++++-----------
 CMake/Android/hdpi.ic_launcher.png   | Bin 3418 -> 3059 bytes
 CMake/Android/mdpi.ic_launcher.png   | Bin 2206 -> 1715 bytes
 CMake/Android/xhdpi.ic_launcher.png  | Bin 4842 -> 4082 bytes
 CMake/Android/xxhdpi.ic_launcher.png | Bin 7718 -> 7266 bytes
 5 files changed, 13 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 CMake/Android/hdpi.ic_launcher.png
 mode change 100644 => 100755 CMake/Android/mdpi.ic_launcher.png
 mode change 100644 => 100755 CMake/Android/xhdpi.ic_launcher.png
 mode change 100644 => 100755 CMake/Android/xxhdpi.ic_launcher.png

(limited to 'CMake/Android')

diff --git a/CMake/Android/CMakeList.txt.in b/CMake/Android/CMakeList.txt.in
index aaa992d95..7c7aeb1fa 100644
--- a/CMake/Android/CMakeList.txt.in
+++ b/CMake/Android/CMakeList.txt.in
@@ -13,25 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# Modified to be a template for Android builds in FLTK
+# Copyright 2019  Matthias Melcher and others
+#
 
 cmake_minimum_required(VERSION 3.4.1)
 
-set(FLTK_DIR ../../../../../../..)
-set(FLTK_IDE_DIR ../../../..)
+set(FLTK_DIR "@ANDROID_FLTK_DIR@")
+set(FLTK_IDE_DIR "../../../..")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 
-# FIXME: add as a second argument the binary build dir
-# so that the first argument can link directly to FLTK
-# instead of the fltk symlink, which is bad for SVN
-add_subdirectory(${FLTK_DIR}/ "${CMAKE_CURRENT_BINARY_DIR}/lib" EXCLUDE_FROM_ALL)
+# FIXME: this includes the entire CMakeLists again, creating an entire library
+#        build in every target
+# TODO:  create separate targets for all fltk libraries that can be easily
+#        linked by all app targets
+add_subdirectory("${FLTK_DIR}/" "${CMAKE_CURRENT_BINARY_DIR}/lib" EXCLUDE_FROM_ALL)
 
-# run FLuid commands if any
+# run Fluid build steps for every .fl file, if any
 @ANDROID_FLUID_COMMANDS@
-
-# copy source files
-@ANDROID_APP_COPY_SOURCES@
-
 # now build app's shared lib
 add_library(
     test_@ANDROID_APP_NAME@ SHARED
@@ -48,6 +48,8 @@ set(CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 
 # add lib dependencies
+# FIXME: apps may depend on additional fltk libraries; thise dependencies
+#        must be created in the CREATE_ANDROID_IDE_FOR_TEST macro
 target_link_libraries(
     test_@ANDROID_APP_NAME@
     fltk
diff --git a/CMake/Android/hdpi.ic_launcher.png b/CMake/Android/hdpi.ic_launcher.png
old mode 100644
new mode 100755
index cde69bccc..1c28eb22b
Binary files a/CMake/Android/hdpi.ic_launcher.png and b/CMake/Android/hdpi.ic_launcher.png differ
diff --git a/CMake/Android/mdpi.ic_launcher.png b/CMake/Android/mdpi.ic_launcher.png
old mode 100644
new mode 100755
index c133a0cbd..4f12dba6a
Binary files a/CMake/Android/mdpi.ic_launcher.png and b/CMake/Android/mdpi.ic_launcher.png differ
diff --git a/CMake/Android/xhdpi.ic_launcher.png b/CMake/Android/xhdpi.ic_launcher.png
old mode 100644
new mode 100755
index bfa42f0e7..aa48b8524
Binary files a/CMake/Android/xhdpi.ic_launcher.png and b/CMake/Android/xhdpi.ic_launcher.png differ
diff --git a/CMake/Android/xxhdpi.ic_launcher.png b/CMake/Android/xxhdpi.ic_launcher.png
old mode 100644
new mode 100755
index 324e72cdd..91aad3864
Binary files a/CMake/Android/xxhdpi.ic_launcher.png and b/CMake/Android/xxhdpi.ic_launcher.png differ
-- 
cgit v1.2.3