Android version compiles and links. Won't run yet.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11344 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 31 insertions, 5 deletions

diff --git a/Android/config.h b/Android/config.h
index 97133f88c..e3bea933c 100644
--- a/Android/config.h
+++ b/Android/config.h
@@ -254,8 +254,8 @@
  * Do we have POSIX locale support?
  */
 
-#define HAVE_LOCALE_H 1
-#define HAVE_LOCALECONV 1
+//#undef HAVE_LOCALE_H
+//#undef HAVE_LOCALECONV
 
 /*
  * HAVE_SYS_SELECT_H:
diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk
index b42a34894..ea733350c 100644
--- a/Android/jni/Android.mk
+++ b/Android/jni/Android.mk
@@ -24,6 +24,18 @@ LOCAL_MODULE     := native-activity
 LOCAL_C_INCLUDES := $(TOP_PATH)
 
 LOCAL_SRC_FILES  := \
+  src/flstring.c \
+  src/scandir.c \
+  src/numericsort.c \
+  src/vsnprintf.c \
+  src/xutf8/is_right2left.c \
+  src/xutf8/is_spacing.c \
+  src/xutf8/case.c \
+  src/xutf8/utf8Input.c \
+  src/xutf8/utf8Utils.c \
+  src/xutf8/utf8Wrap.c \
+  src/xutf8/keysym2Ucs.c \
+  src/fl_utf.c \
   src/Fl.cxx \
   src/Fl_Adjuster.cxx \
   src/Fl_Bitmap.cxx \
@@ -108,7 +120,6 @@ LOCAL_SRC_FILES  := \
   src/Fl_Window_fullscreen.cxx \
   src/Fl_Window_hotspot.cxx \
   src/Fl_Window_iconize.cxx \
-  src/Fl_Window_shape.cxx \
   src/Fl_Wizard.cxx \
   src/Fl_XBM_Image.cxx \
   src/Fl_XPM_Image.cxx \
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
index cbe0c9ed7..ec134f5cb 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
@@ -88,6 +88,8 @@ double Fl_PicoAndroid_Screen_Driver::wait(double time_to_wait)
  * All this must be refactored into the driver system!
  */
 
+Fl_Fontdesc* fl_fonts = NULL;
+
 /*
 
  The following symbols are not found if we naively compile the core modules and
@@ -156,6 +158,10 @@ Window fl_window;
 //void Fl_Image_Surface::translate(int x, int y) { }
 //void Fl_Image_Surface::untranslate() { }
 
+void Fl::add_fd(int, int, void (*)(int, void*), void*)
+{
+}
+
 void Fl::add_fd(int, void (*)(int, void*), void*)
 {
 }
@@ -174,6 +180,15 @@ int Fl_Window::decorated_w()
   return w();
 }
 
+// these pointers are set by the Fl::lock() function:
+static void nothing() {}
+void (*fl_lock_function)() = nothing;
+void (*fl_unlock_function)() = nothing;
+
+Fl_Font_Descriptor::~Fl_Font_Descriptor()
+{
+}
+
 
 //
 // End of "$Id: Fl_PicoAndroid_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
diff --git a/src/xutf8/case.c b/src/xutf8/case.c
index 8efc0e397..11e3b1cf5 100644
--- a/src/xutf8/case.c
+++ b/src/xutf8/case.c
@@ -19,7 +19,7 @@
  * This file is required on all platforms for UTF-8 support
  */
 
-#if !defined(WIN32) && !defined(__APPLE__)
+#if !defined(WIN32) && !defined(__APPLE__) && !defined(ANDROID)
 #  include "../Xutf8.h"
 #endif /* !defined(WIN32) && !defined(__APPLE__) */
 
diff --git a/src/xutf8/is_spacing.c b/src/xutf8/is_spacing.c
index 6e3d6abd3..040e6828c 100644
--- a/src/xutf8/is_spacing.c
+++ b/src/xutf8/is_spacing.c
@@ -18,7 +18,7 @@
  * This file is required on all platforms for utf8 support
  */
 
-#if !defined(WIN32) && !defined(__APPLE__)
+#if !defined(WIN32) && !defined(__APPLE__) && !defined(ANDROID)
 #  include "../Xutf8.h"
 #endif /* !defined(WIN32) && !defined(__APPLE__) */