diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2018-03-05 23:27:31 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2018-03-05 23:27:31 +0000 |
| commit | 1e96cc6b2f7f672776b3990df50347e0129f2215 (patch) | |
| tree | f16b5e7c1c427b3af34b4977eae43ad740d4c863 | |
| parent | 3ed5e71da71e50849eb9e2c3244e843bc5e38a05 (diff) | |
Android: moved include files as well
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12712 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | README.Android.txt | 8 | ||||
| -rw-r--r-- | ide/AndroidStudio3/FL/abi-version.h (renamed from Android/FL/abi-version.h) | 0 | ||||
| -rw-r--r-- | ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 2 deletions
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/Android/FL/abi-version.h b/ide/AndroidStudio3/FL/abi-version.h index 9a5e4b89f..9a5e4b89f 100644 --- a/Android/FL/abi-version.h +++ b/ide/AndroidStudio3/FL/abi-version.h 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. |