From e8a2c4621aac6144198744f1dc60e5b32495cad3 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Fri, 2 Mar 2018 20:06:31 +0000 Subject: Android: added missing file. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12700 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Android/HelloAndroid') 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. -- cgit v1.2.3