From b9dac8f6f6f5fa9a1b45f53415480449f48300b2 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Fri, 2 Mar 2018 20:12:55 +0000
Subject: Android: should build and run

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12701 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 Android/HelloAndroid/app/app.iml | 1 +
 fluid/CMakeLists.txt             | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Android/HelloAndroid/app/app.iml b/Android/HelloAndroid/app/app.iml
index d5a0145df..ffb02d88c 100644
--- a/Android/HelloAndroid/app/app.iml
+++ b/Android/HelloAndroid/app/app.iml
@@ -112,6 +112,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
index 529c7dfba..feeeb78c2 100644
--- a/fluid/CMakeLists.txt
+++ b/fluid/CMakeLists.txt
@@ -16,6 +16,9 @@
 #     http://www.fltk.org/str.php
 #
 
+
+if(NOT ANDROID)
+
 set(CPPFILES
     CodeEditor.cxx
     Fl_Function_Type.cxx
@@ -46,7 +49,6 @@ else ()
     list(APPEND CPPFILES ExternalCodeEditor_UNIX.cxx)
 endif (WIN32)
 
-if(NOT ANDROID)
 if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
   set( ICON_NAME fluid.icns )
   set( ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Resources/${ICON_NAME}" )
@@ -54,7 +56,6 @@ if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
 else()
   add_executable(fluid WIN32 ${CPPFILES})
 endif(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
-endif(NOT ANDROID)
 
 target_link_libraries(fluid fltk fltk_images fltk_forms)
 
@@ -94,3 +95,6 @@ if(UNIX)
         )
     endforeach()
 endif(UNIX)
+
+endif(NOT ANDROID)
+
-- 
cgit v1.2.3