FLTK: fix cross compile under linux

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2015-07-18
 	Added IDE editor sdl/android
+	Made a few minor performance improvements (SDL)
 
 2015-06-07
 	Fixed PRINT 1/1000 and other floating point rounding issues

configure.ac

@@ -140,26 +140,28 @@ function buildFLTK() {
    esac
 
    FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk2-config --cxxflags` -fno-exceptions"
-   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk2-config --ldflags --use-images`"
+   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk2-config --ldstaticflags --use-images`"
 
    dnl do not depend on cygwin.dll under cygwin build
    case "${host_os}" in
      *mingw* | cygwin*)
-     FLTK_CXXFLAGS="-I`cygpath -m /usr/local/include` ${FLTK_CXXFLAGS} -mms-bitfields"
-     PACKAGE_LIBS="-L`cygpath -m /usr/local/lib` ${PACKAGE_LIBS} -lwsock32 -static-libgcc"
+     FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -mms-bitfields"
+     PACKAGE_LIBS="-Wl,-Bstatic ${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
      AC_DEFINE(_Win32, 1, [Windows build])
+     ;;
+
+     *)
+     dnl check for sdl2-config for sound output
+     AC_CHECK_PROG(have_sdl, sdl2-config, [yes], [no])
+     if test "${have_sdl}" = "yes" ; then
+       FLTK_CXXFLAGS="${FLTK_CXXFLAGS} `sdl2-config --cflags`"
+       PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --libs`"
+       AC_DEFINE(HAVE_SDL, 1, [Windows build])
+     fi
    esac
 
    defaultConditionals
 
-   dnl check for sdl-config for sound output
-   AC_CHECK_PROG(have_sdl, sdl-config, [yes], [no])
-   if test "${have_sdl}" = "yes" ; then
-     FLTK_CXXFLAGS="${FLTK_CXXFLAGS} `sdl-config --cflags`"
-     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl-config --libs`"
-     AC_DEFINE(HAVE_SDL, 1, [Windows build])
-   fi
-
    dnl preconfigured values for FLTK build
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_FLTK, 1, [Defined for FLTK build.])
@@ -200,8 +202,8 @@ function buildSDL() {
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
 
      dnl do not depend on cygwin.dll under cygwin build
-     PACKAGE_CFLAGS="-I`cygpath -m /usr/local/include` ${PACKAGE_CFLAGS} -mms-bitfields"
-     PACKAGE_LIBS="-L`cygpath -m /usr/local/lib` ${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
+     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -mms-bitfields"
+     PACKAGE_LIBS="${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
      AC_DEFINE(_Win32, 1, [Windows build])
      ;;
 

src/platform/fltk/HelpWidget.cxx

@@ -2942,7 +2942,7 @@ Image *loadImage(const char *imgSrc) {
 
 #if defined(WIN32)
 #include <windows.h>
-#include <fltk/window.h>
+#include <fltk/Window.h>
 #include <fltk/win32.h>
 #endif
 

src/platform/fltk/Profile.cxx

@@ -74,7 +74,7 @@ void Profile::restore(MainWindow *wnd) {
     restoreValue(&profile, lineNumbersKey, &_lineNumbers);
     restoreStyles(&profile);
 
-    Rectangle rc;
+    fltk::Rectangle rc;
     rc = restoreRect(&profile, appPositionKey);
     if (!rc.empty()) {
       _appPosition = rc;
@@ -93,7 +93,7 @@ void Profile::restore(MainWindow *wnd) {
 //
 // restore the standalone window position
 //
-void Profile::restoreAppPosition(Rectangle *wnd) {
+void Profile::restoreAppPosition(fltk::Rectangle *wnd) {
   if (!_appPosition.empty()) {
     wnd->w(_appPosition.w());
     wnd->h(_appPosition.h());
@@ -142,8 +142,8 @@ int Profile::nextInteger(const char *s, int len, int &index) {
 //
 // restore a rectangle value with the given key
 //
-Rectangle Profile::restoreRect(Properties *profile, const char *key) {
-  Rectangle result(0, 0, 0, 0);
+fltk::Rectangle Profile::restoreRect(Properties *profile, const char *key) {
+  fltk::Rectangle result(0, 0, 0, 0);
   String *value = profile->get(key);
   if (value != NULL) {
     const char *buffer = value->c_str();
@@ -253,7 +253,7 @@ void Profile::restoreValue(Properties *p, const char *key, int *value) {
 //
 // restore the main window position
 //
-void Profile::restoreWindowPos(MainWindow *wnd, Rectangle &rc) {
+void Profile::restoreWindowPos(MainWindow *wnd, fltk::Rectangle &rc) {
   int x = rc.x();
   int y = rc.y();
   int w = rc.w();
@@ -270,7 +270,7 @@ void Profile::restoreWindowPos(MainWindow *wnd, Rectangle &rc) {
 //
 // save the window position
 //
-void Profile::saveRect(FILE *fp, const char *key, Rectangle *rc) {
+void Profile::saveRect(FILE *fp, const char *key, fltk::Rectangle *rc) {
   fprintf(fp, "%s=%d;%d;%d;%d\n", key, rc->x(), rc->y(), rc->w(), rc->h());
 }
 

src/platform/fltk/audio.cxx

@@ -13,8 +13,8 @@
 #include "common/osd.h"
 
 #if defined(HAVE_SDL)
-#include <SDL/SDL.h>
-#include <SDL/SDL_audio.h>
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_audio.h>
 #include <queue>
 #include <cmath>
 

src/platform/fltk/dev_fltk.cxx

@@ -468,7 +468,7 @@ int System::ask(const char *title, const char *prompt, bool cancel) {
   if (cancel) {
     return fltk::choice(prompt, "Yes", "No", "Cancel");
   } else {
-    return fltk::choice(prompt, "Yes", "No");
+    return fltk::choice(prompt, "Yes", "No", "");
   }
 }
 

src/platform/fltk/display.cxx

@@ -218,6 +218,8 @@ int Canvas::getPixel(int x, int y) {
     int delta = _img->buffer_linedelta();
     U32 *row = (U32 *)(_img->buffer() + (y * delta));
     result = row[x];
+  } else {
+    result = 0;
   }
 #else
   GSave gsave;

src/ui/image.cpp

@@ -110,7 +110,7 @@ ImageBuffer *load_image(dev_file_t *filep) {
   ImageBuffer *result = NULL;
   List_each(ImageBuffer *, it, cache) {
     ImageBuffer *next = (*it);
-    if (strcmp(next->_filename, filep->name) == 0) {
+    if (next->_filename != NULL && strcmp(next->_filename, filep->name) == 0) {
       result = next;
       break;
     }

src/ui/textedit.h

@@ -157,7 +157,7 @@ struct TextEditHelpWidget : public TextEditInput {
   void createSearch(bool replace);
   bool edit(int key, int screenWidth, int charWidth);
   char *copy(bool cut) { return NULL; }
-  void paste(char *text) {}
+  void paste(const char *text) {}
   bool isDrawTop() { return true; }
   void resize(int w, int h) { _x = w - _width; _height = h; }
   void reset(HelpMode mode);