Skip to content

Commit

Permalink
Android: added missing file.
Browse files Browse the repository at this point in the history
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12700 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Matthias Melcher committed Mar 2, 2018
1 parent 4255505 commit e8a2c46
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 3 deletions.
31 changes: 31 additions & 0 deletions 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 $".
*/
8 changes: 5 additions & 3 deletions Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt
Expand Up @@ -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.
Expand Down

0 comments on commit e8a2c46

Please sign in to comment.