diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2018-03-02 20:06:31 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2018-03-02 20:06:31 +0000 |
| commit | e8a2c4621aac6144198744f1dc60e5b32495cad3 (patch) | |
| tree | 22c59fc3e4e1fe4606f454dd3686a19e807007d8 /Android | |
| parent | 42555053a11cff99d49876cb373806fd9708ad8b (diff) | |
Android: added missing file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12700 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'Android')
| -rw-r--r-- | Android/FL/abi-version.h | 31 | ||||
| -rw-r--r-- | Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt | 8 |
2 files changed, 36 insertions, 3 deletions
diff --git a/Android/FL/abi-version.h b/Android/FL/abi-version.h new file mode 100644 index 000000000..9a5e4b89f --- /dev/null +++ b/Android/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/Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt b/Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt index daf4a16fb..408052168 100644 --- a/Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt +++ b/Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt @@ -16,18 +16,20 @@ cmake_minimum_required(VERSION 3.4.1) +set(FLTK_DIR ../../../../../..) + # 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(../../../../../../ "${CMAKE_CURRENT_BINARY_DIR}/fltk" EXCLUDE_FROM_ALL) +add_subdirectory(${FLTK_DIR}/ "${CMAKE_CURRENT_BINARY_DIR}/fltk" EXCLUDE_FROM_ALL) # now build app's shared lib add_library(android-hello SHARED HelloAndroid.cxx) target_include_directories(android-hello PRIVATE - /Users/matt/dev/fltk-1.4.svn - /Users/matt/dev/fltk-1.4.svn/Android) + ${FLTK_DIR}/ + ${FLTK_DIR}/Android/) # Export ANativeActivity_onCreate(),
# Refer to: https://github.com/android-ndk/ndk/issues/381. |