diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-03-11 01:01:58 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-03-11 01:01:58 +0000 |
| commit | 914248bbf04675f2e8096dadae4ffa35e6982293 (patch) | |
| tree | 2e08e3223366ee071cda612dd40121e19dd30d82 /src | |
| parent | ac1932eaa7630d8dbe07846f027986f77afa6b5a (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx | 15 | ||||
| -rw-r--r-- | src/xutf8/case.c | 2 | ||||
| -rw-r--r-- | src/xutf8/is_spacing.c | 2 |
3 files changed, 17 insertions, 2 deletions
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__) */ |