From 1e96cc6b2f7f672776b3990df50347e0129f2215 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Mon, 5 Mar 2018 23:27:31 +0000
Subject: Android: moved include files as well

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12712 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 Android/FL/abi-version.h                           | 31 ----------------------
 README.Android.txt                                 |  8 +++++-
 ide/AndroidStudio3/FL/abi-version.h                | 31 ++++++++++++++++++++++
 ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt |  2 +-
 4 files changed, 39 insertions(+), 33 deletions(-)
 delete mode 100644 Android/FL/abi-version.h
 create mode 100644 ide/AndroidStudio3/FL/abi-version.h

diff --git a/Android/FL/abi-version.h b/Android/FL/abi-version.h
deleted file mode 100644
index 9a5e4b89f..000000000
--- a/Android/FL/abi-version.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * "$Id: abi-version.h 12196 2017-03-13 23:31:38Z AlbrechtS $"
- *
- * Configuration file for the Fast Light Tool Kit (FLTK).
- *
- * Copyright 1998-2015 by Bill Spitzak and others.
- *
- * This library is free software. Distribution and use rights are outlined in
- * the file "COPYING" which should have been included with this file.  If this
- * file is missing or damaged, see the license at:
- *
- *     http://www.fltk.org/COPYING.php
- *
- * Please report all bugs and problems on the following page:
- *
- *     http://www.fltk.org/str.php
- */
-
-/*
-  ============================================================================
-    DO NOT EDIT - This file is generated by CMake !
-  ============================================================================
-*/
-
-/* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */
-
-/* #undef FL_ABI_VERSION */
-
-/*
- * End of "$Id: abi-version.h 12196 2017-03-13 23:31:38Z AlbrechtS $".
- */
diff --git a/README.Android.txt b/README.Android.txt
index d4f418531..ccba2c480 100644
--- a/README.Android.txt
+++ b/README.Android.txt
@@ -23,11 +23,17 @@ AndroidStudio for the first time, use the IDE to download and build the
 FLTK will be installed. Once Native Plasm runs on your emulator or physical
 device, you are ready to install FLTK.
 
-Open the Android/HelloAndroid directory in AndroidStudio. The project should compile and run out of the box.
+- if your host machine runs MSWindows, unzip the file
+  "ide/AndroidStudio3/gradlew.zip" first
+
+- open the "ide/AndroidStudio3/" directory as a project in AndroidStudio
+
+- click "run"; the project should compile and run out of the box
 
 
  DOCUMENT HISTORY
 ==================
 
+Mar 6 2018 - matt: moved project to ide/AndroidStudio3/
 Mar 2 2018 - matt: rewriting Android port and documentation from scratch
 Feb 9 2016 - matt: recreated document with more warnings and active support
diff --git a/ide/AndroidStudio3/FL/abi-version.h b/ide/AndroidStudio3/FL/abi-version.h
new file mode 100644
index 000000000..9a5e4b89f
--- /dev/null
+++ b/ide/AndroidStudio3/FL/abi-version.h
@@ -0,0 +1,31 @@
+/*
+ * "$Id: abi-version.h 12196 2017-03-13 23:31:38Z AlbrechtS $"
+ *
+ * Configuration file for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-2015 by Bill Spitzak and others.
+ *
+ * This library is free software. Distribution and use rights are outlined in
+ * the file "COPYING" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at:
+ *
+ *     http://www.fltk.org/COPYING.php
+ *
+ * Please report all bugs and problems on the following page:
+ *
+ *     http://www.fltk.org/str.php
+ */
+
+/*
+  ============================================================================
+    DO NOT EDIT - This file is generated by CMake !
+  ============================================================================
+*/
+
+/* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */
+
+/* #undef FL_ABI_VERSION */
+
+/*
+ * End of "$Id: abi-version.h 12196 2017-03-13 23:31:38Z AlbrechtS $".
+ */
diff --git a/ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt b/ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt
index 408052168..c7530ae38 100644
--- a/ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt
+++ b/ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt
@@ -29,7 +29,7 @@ add_library(android-hello SHARED
 
 target_include_directories(android-hello PRIVATE 
     ${FLTK_DIR}/
-    ${FLTK_DIR}/Android/)
+    ${FLTK_DIR}/ide/AndroidStudio3/)
 
 # Export ANativeActivity_onCreate(),

 # Refer to: https://github.com/android-ndk/ndk/issues/381.
-- 
cgit v1.2.3