From 914248bbf04675f2e8096dadae4ffa35e6982293 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Fri, 11 Mar 2016 01:01:58 +0000
Subject: 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
---
 Android/config.h       |  4 ++--
 Android/jni/Android.mk | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'Android')

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 \
-- 
cgit v1.2.3