Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-21 22:51:41 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Android: should build and run

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12701 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2018-03-02 20:12:55 +00:00
parent e8a2c4621a
commit b9dac8f6f6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android/HelloAndroid/app/app.iml
+1
View File
@@ -112,6 +112,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
fluid/CMakeLists.txt
+6 -2
View File
@@ -16,6 +16,9 @@
# http://www.fltk.org/str.php
#
if(NOT ANDROID)
set(CPPFILES
CodeEditor.cxx
Fl_Function_Type.cxx
@@ -46,7 +49,6 @@ else ()
list(APPEND CPPFILES ExternalCodeEditor_UNIX.cxx)
endif (WIN32)
if(NOT ANDROID)
if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
set( ICON_NAME fluid.icns )
set( ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Resources/${ICON_NAME}" )
@@ -54,7 +56,6 @@ if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
else()
add_executable(fluid WIN32 ${CPPFILES})
endif(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
endif(NOT ANDROID)
target_link_libraries(fluid fltk fltk_images fltk_forms)
@@ -94,3 +95,6 @@ if(UNIX)
)
endforeach()
endif(UNIX)
endif(NOT ANDROID)