Merge pull request #11 from chrisws/android

Android version 0.11.8 + SDL update

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2014-07-07
+	Update SDL to use SDL2 and common widget
+
 2014-06-14
 	Fix crash evaluating "a \\ b"
 	Fix INPUT command in FLTK for scrolled display
@@ -32,7 +35,7 @@
 	for PalmOS to appear correctly on modern mobile screen resolutions.
 
 2012-12-09
-	Released 0.11.1 android version to google play
+	Released 0.11.2 android version to google play
 	Added the ability to change the font size
 
 2012-12-01

configure.ac

@@ -1,13 +1,13 @@
 dnl 
 dnl Configure script for SmallBASIC
 dnl
-dnl Copyright(C) 2001-2012 Chris Warren-Smith.
+dnl Copyright(C) 2001-2014 Chris Warren-Smith.
 dnl
 dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.11.6])
+AC_INIT([smallbasic], [0.11.8])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -347,94 +347,58 @@ function buildSDL() {
    TARGET="Building SDL version."
    defaultConditionals
 
-   dnl The following code was taken from the SDL test/configure.ac
-   dnl Figure out which math library to use
-   MATHLIB=""
-   SYS_GL_LIBS=""
-
-   case "$host" in
-    *-*-cygwin* | *-*-mingw32*)
-        SYS_GL_LIBS="-lopengl32"
-        PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -mms-bitfields -mno-cygwin"
-        PACKAGE_LIBS="${PACKAGE_LIBS} -lwsock32"
-        ;;
-    *)
-        MATHLIB="-lm"
-        SYS_GL_LIBS="-lGL"
-        ;;
-   esac
-
-   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl-config --cflags`"
-   PACKAGE_LIBS="${PACKAGE_LIBS} `sdl-config --libs` ${MATHLIB}"
+   AC_CHECK_PROG(have_sdl, sdl2-config, [yes], [no])
+   if test "${have_sdl}" = "no" ; then
+     AC_MSG_ERROR([libsdl2-dev not installed: configure failed.])
+   fi
 
-   dnl Check for OpenGL
-   AC_MSG_CHECKING(for OpenGL support)
-   have_opengl=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-     #include "SDL/SDL_opengl.h"
-     ]], [[
-     ]])],[
-     have_opengl=yes
-   ],[])
-   AC_MSG_RESULT($have_opengl)
-   if test x$have_opengl = xyes; then
-     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -DHAVE_OPENGL "
-     PACKAGE_LIBS="${PACKAGE_LIBS} ${SYS_GL_LIBS}"
+   AC_CHECK_PROG(have_freetype2, freetype-config, [yes], [no])
+   if test "${have_freetype2}" = "no" ; then
+     AC_MSG_ERROR([libfreetype6-dev not installed: configure failed.])
    fi
 
-   dnl Check for SDL_Image
-   AC_MSG_CHECKING(for SDL_Image support)
-   have_sdl_image=no
+   AC_MSG_CHECKING(for SDL_image)
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-     #include "SDL/SDL_image.h"
-     ]], [[
-     ]])],[
-     have_sdl_image=yes
-   ],[])
-   AC_MSG_RESULT($have_sdl_image)
-   if test x$have_sdl_image = xyes; then
-      AC_DEFINE(HAVE_SDL_IMAGE, 1, [SDL Image header is present.])
-      AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
-      PACKAGE_LIBS="${PACKAGE_LIBS} -lSDL_image"
-   fi
+     #include "SDL2/SDL_image.h"
+     ]], [[]])],
+    [AC_MSG_RESULT([yes])],
+    [AC_MSG_ERROR([libsdl2-image-dev not installed: configure failed])])
 
-   dnl Check for guichan.hpp
-   dnl see http://guichan.sourceforge.net/wiki/index.php"
-   AC_MSG_CHECKING(for guichan forms support)
-   have_guichan="maybe"
-   AC_LANG_PUSH(C++)
-   AC_CHECK_HEADER(guichan.hpp, [have_guichan="yes"], [have_guichan="no"])
-   AC_LANG_POP(C++)
-   AC_MSG_RESULT($have_guichan)
-   if test x$have_guichan = xyes && test x$have_sdl_image = xyes; then
-      dnl need SDL_Image as well
-      AC_DEFINE(IMPL_UI, 1, [Guichan forms support found])
-      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -DGUICHAN_BUILD -I/usr/local/include"
-      PACKAGE_LIBS="-lguichan_sdl -lguichan ${PACKAGE_LIBS}"
-   fi
+   # Check fontconfig configuration
+   PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2)
+   AC_SUBST(FONTCONFIG_CFLAGS)
+   AC_SUBST(FONTCONFIG_LIBS)
+
+   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags`"
+   PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS} `sdl2-config --libs` `freetype-config --libs` -ldl"
 
    dnl preconfigured values for SDL build
-   AC_DEFINE(KBHIT_PWR_CONSERVE, 1, [Conserve power in dev_kbhit()])
+   AC_DEFINE(_SDL, 1, [Defined when building SDL version])
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
    AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(_SDL, 1, [Defined when building SDL version])
+   AC_DEFINE(IMPL_DEV_GETS, 1, [Driver implements dev_gets()])
+   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
+   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
+   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
+   AC_DEFINE(IMPL_OSD_SOUND, 1, [Driver implements osd_sound()]) 
+   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
+   AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
+   AC_DEFINE(OS_PREC64, 1, [64 bit variables])
+   AC_DEFINE(DRV_BEEP, 1, [Use the driver based beep function])
 
    BUILD_SUBDIRS="src/common src/platform/sdl"
    AC_SUBST(BUILD_SUBDIRS)
+   (cd ide/android/assets && xxd -i main.bas > ../../../src/platform/sdl/main_bas.h)
 }
 
 function buildQT() {
    TARGET="Building QT version."
 
    dnl Checks for qmake
    AC_CHECK_PROG(have_qt, qmake, [yes], [no])
- 
-   if test "${HAVE_API_VERSION}" = "no" ; then
-       AC_MSG_ERROR([
-     You need QT version 4.*
-     configure failed.
-   ])
+   if test "${have_qt}" = "no" ; then
+     AC_MSG_ERROR([You need QT version 4.* configure failed.])
    fi
 
    dnl avoid using MSCRT versions of printf for long double
@@ -494,6 +458,7 @@ function buildMosync() {
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(NONSTANDARD_PORT, 1, [sys.h should include portdefs.h])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
+   AC_DEFINE(_MOSYNC, 1, [Defined for Mosync build.])
 
    dnl Checks for mosync
    AC_CHECK_PROG(have_mosync, pipe-tool, [yes], [no])
@@ -558,7 +523,7 @@ function buildAndroid() {
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
    AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 0, [Newlib version causes mosync stack panic])
-   AC_DEFINE(CPU_BIGENDIAN, 1, [Tizen uses big-endian])
+   AC_DEFINE(CPU_BIGENDIAN, 1, [Android uses big-endian])
    AC_DEFINE(NO_SCAN_ERROR_PROMPT, 1, [No prompt for detailed scan report])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])

ide/android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
-          android:versionCode="6"
-          android:versionName="0.11.6">
+          android:versionCode="10"
+          android:versionName="0.11.8">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9" />
 

ide/android/assets/main.bas

@@ -30,7 +30,7 @@ sub about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.11.6"
+  print "Version 0.11.8"
   print
   print "Copyright (c) 2002-2014 Chris Warren-Smith"
   print "Copyright (c) 2000-2006 Nic Christopoulos" + chr(10)
@@ -56,7 +56,7 @@ sub setup()
   print boldOn + "Setup web service port number."
   print boldOff
   print "Enter a port number to allow web browser or desktop IDE access. ";
-  print "Enter -1 to diable this feature, or press <enter> to leave ";
+  print "Enter -1 to disable this feature, or press <enter> to leave ";
   print "this screen without making any changes."
   print "The current setting is: " + env("serverSocket")
   print

src/common/bc.h

@@ -43,7 +43,7 @@ typedef struct {
  * @param fmt the printf's format
  * @param ... format's parameters
  */
-void sc_raise(const char *fmt, ...) SEC(BCSCAN);
+void sc_raise(const char *fmt, ...);
 
 /**
  * @ingroup scan
@@ -52,7 +52,7 @@ void sc_raise(const char *fmt, ...) SEC(BCSCAN);
  *
  * @param bc the bc structure
  */
-void bc_create(bc_t * bc) SEC(BCSCAN);
+void bc_create(bc_t * bc);
 
 /**
  * @ingroup scan
@@ -61,7 +61,7 @@ void bc_create(bc_t * bc) SEC(BCSCAN);
  *
  * @param bc the bc structure
  */
-void bc_destroy(bc_t * bc) SEC(BCSCAN);
+void bc_destroy(bc_t * bc);
 
 /**
  * @ingroup scan
@@ -71,7 +71,7 @@ void bc_destroy(bc_t * bc) SEC(BCSCAN);
  * @param bc the bc structure
  * @param newsize the new size
  */
-void bc_resize(bc_t * bc, dword newsize) SEC(BCSCAN);
+void bc_resize(bc_t * bc, dword newsize);
 
 /**
  * @ingroup scan
@@ -81,7 +81,7 @@ void bc_resize(bc_t * bc, dword newsize) SEC(BCSCAN);
  * @param bc the bc structure
  * @param code the byte
  */
-void bc_add1(bc_t * bc, byte code) SEC(BCSCAN);
+void bc_add1(bc_t * bc, byte code);
 
 /**
  * @ingroup scan
@@ -91,7 +91,7 @@ void bc_add1(bc_t * bc, byte code) SEC(BCSCAN);
  * @param bc the bc structure
  * @param code the byte
  */
-void bc_store1(bc_t * bc, addr_t offset, byte code) SEC(BCSCAN);
+void bc_store1(bc_t * bc, addr_t offset, byte code);
 
 /**
  * @ingroup scan
@@ -101,7 +101,7 @@ void bc_store1(bc_t * bc, addr_t offset, byte code) SEC(BCSCAN);
  * @param bc the bc structure
  * @param code the word
  */
-void bc_add_word(bc_t * bc, word code) SEC(BCSCAN);
+void bc_add_word(bc_t * bc, word code);
 
 /**
  * @ingroup scan
@@ -111,7 +111,7 @@ void bc_add_word(bc_t * bc, word code) SEC(BCSCAN);
  * @param bc the bc structure
  * @param code the dword
  */
-void bc_add_dword(bc_t * bc, dword code) SEC(BCSCAN);
+void bc_add_dword(bc_t * bc, dword code);
 
 /**
  * @ingroup scan
@@ -122,7 +122,7 @@ void bc_add_dword(bc_t * bc, dword code) SEC(BCSCAN);
  * @param str the raw-string. the string must starts with \". the string must also contains the ending \".
  * @return a pointer of src to the next character after the second \"
  */
-char *bc_store_string(bc_t * bc, char *src) SEC(BCSCAN);
+char *bc_store_string(bc_t * bc, char *src);
 
 /**
  * @ingroup scan
@@ -133,7 +133,7 @@ char *bc_store_string(bc_t * bc, char *src) SEC(BCSCAN);
  * @param str the raw-string. the string must starts with `. the string must also contains the ending `.
  * @return a pointer of src to the next character after the second `
  */
-char *bc_store_macro(bc_t * bc, char *src) SEC(BCSCAN);
+char *bc_store_macro(bc_t * bc, char *src);
 
 /**
  * @ingroup scan
@@ -142,7 +142,7 @@ char *bc_store_macro(bc_t * bc, char *src) SEC(BCSCAN);
  *
  * @param bc the bc structure
  */
-void bc_eoc(bc_t * bc) SEC(BCSCAN);
+void bc_eoc(bc_t * bc);
 
 /**
  * @ingroup scan
@@ -152,7 +152,7 @@ void bc_eoc(bc_t * bc) SEC(BCSCAN);
  * @param dest the destination
  * @param src the code to be appended to dest
  */
-void bc_append(bc_t * dest, bc_t * src) SEC(BCSCAN);
+void bc_append(bc_t * dest, bc_t * src);
 
 /**
  * @ingroup scan
@@ -163,7 +163,7 @@ void bc_append(bc_t * dest, bc_t * src) SEC(BCSCAN);
  * @param src the code to be appended to dest
  * @param n the size of the src to be copied
  */
-void bc_add_n(bc_t * dest, byte * src, dword n) SEC(BCSCAN);
+void bc_add_n(bc_t * dest, byte * src, dword n);
 
 /**
  * @ingroup scan
@@ -179,7 +179,7 @@ void bc_add_n(bc_t * dest, byte * src, dword n) SEC(BCSCAN);
  * @param dest the bc segment
  * @param idx the index of the function
  */
-void bc_add_fcode(bc_t * dest, long idx) SEC(BCSCAN);
+void bc_add_fcode(bc_t * dest, long idx);
 
 /**
  * @ingroup scan
@@ -189,7 +189,7 @@ void bc_add_fcode(bc_t * dest, long idx) SEC(BCSCAN);
  * @param dest the bc segment
  * @param idx the index of the procedure
  */
-void bc_add_pcode(bc_t * dest, long idx) SEC(BCSCAN);
+void bc_add_pcode(bc_t * dest, long idx);
 
 /**
  * @ingroup scan
@@ -200,7 +200,7 @@ void bc_add_pcode(bc_t * dest, long idx) SEC(BCSCAN);
  * @param lib the index of the library
  * @param idx the index of the function
  */
-void bc_add_extfcode(bc_t * dest, int lib, long idx) SEC(BCSCAN);
+void bc_add_extfcode(bc_t * dest, int lib, long idx);
 
 /**
  * @ingroup scan
@@ -211,7 +211,7 @@ void bc_add_extfcode(bc_t * dest, int lib, long idx) SEC(BCSCAN);
  * @param lib the index of the library
  * @param idx the index of the procedure
  */
-void bc_add_extpcode(bc_t * dest, int lib, long idx) SEC(BCSCAN);
+void bc_add_extpcode(bc_t * dest, int lib, long idx);
 
 /**
  * @ingroup scan
@@ -221,7 +221,7 @@ void bc_add_extpcode(bc_t * dest, int lib, long idx) SEC(BCSCAN);
  * @param bc the bc segment
  * @param idx the address
  */
-void bc_add_addr(bc_t * bc, addr_t idx) SEC(BCSCAN);
+void bc_add_addr(bc_t * bc, addr_t idx);
 
 /**
  * @ingroup scan
@@ -233,7 +233,7 @@ void bc_add_addr(bc_t * bc, addr_t idx) SEC(BCSCAN);
  * @param true_ip the jump-address when on true
  * @param false_ip the jump-address when on false
  */
-void bc_add_ctrl(bc_t * bc, code_t code, addr_t true_ip, addr_t false_ip) SEC(BCSCAN);
+void bc_add_ctrl(bc_t * bc, code_t code, addr_t true_ip, addr_t false_ip);
 
 /**
  * @ingroup scan
@@ -243,7 +243,7 @@ void bc_add_ctrl(bc_t * bc, code_t code, addr_t true_ip, addr_t false_ip) SEC(BC
  * @param bc the bc segment
  * @param v the number
  */
-void bc_add_creal(bc_t * bc, var_num_t v) SEC(BCSCAN);
+void bc_add_creal(bc_t * bc, var_num_t v);
 
 /**
  * @ingroup scan
@@ -253,6 +253,6 @@ void bc_add_creal(bc_t * bc, var_num_t v) SEC(BCSCAN);
  * @param bc the bc segment
  * @param v the number
  */
-void bc_add_cint(bc_t * bc, var_int_t v) SEC(BCSCAN);
+void bc_add_cint(bc_t * bc, var_int_t v);
 
 #endif