Merge pull request #152 from chrisws/12_25

12 25

configure.ac

@@ -234,10 +234,14 @@ function buildSDL() {
 }
 
 function buildAndroid() {
-   TARGET="Building for Android."
-
    defaultConditionals
 
+   AC_MSG_CHECKING([if library mode is enabled])
+   AC_ARG_WITH(library,
+   [  --with-library            Build the android as a library default=no],
+       [with_library=$with_library],
+       [with_library=no])
+   AC_MSG_RESULT([$with_library])
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_ANDROID, 1, [Defined for Android build.])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
@@ -248,6 +252,13 @@ function buildAndroid() {
 
    TEST_DIR="src/platform/android"
    AC_SUBST(TEST_DIR)
+   if test $with_library = no; then
+      (cd src/platform/android/webui && npm run build)
+      TARGET="Building for Android."
+   else
+      TARGET="Building for Android library."
+      AC_DEFINE(_ANDROID_LIBRARY, 1, [android library build enabled])
+   fi
 }
 
 function buildConsole() {

src/common/screen.c

@@ -304,6 +304,18 @@ void osd_line(int x1, int y1, int x2, int y2);
 //
 void dev_rect(int x1, int y1, int x2, int y2, int fill) {
   int c1, c2, in1, in2;
+
+  if (x2 < x1) {
+    int x11 = x1;
+    x1 = x2;
+    x2 = x11;
+  }
+  if (y2 < y1) {
+    int y11 = y1;
+    y1 = y2;
+    y2 = y11;
+  }
+
   int px1 = x1;
   int py1 = y1;
   int px2 = x2;
@@ -409,6 +421,9 @@ void dev_window(int x1, int y1, int x2, int y2) {
   }
 }
 
+//
+// set screen width and height
+//
 void dev_resize(int width, int height) {
   if (dev_Vx2 == dev_Vdx && dev_Vx2 == os_graf_mx - 1) {
     // viewport width is full-screen
@@ -432,6 +447,9 @@ void dev_resize(int width, int height) {
   setsysvar_int(SYSVAR_YMAX, height - 1);
 }
 
+//
+// remap x/y to world coordinates
+//
 void dev_map_point(int *x, int *y) {
   *x = W2X(*x);
   *y = W2Y(*y);

src/platform/android/Makefile.am

@@ -31,5 +31,10 @@ ndk-build-release:
 	(cd jni && ${NDK}/ndk-build NDK_DEBUG=0)
 
 release:
-	(./gradle assemble)
+	(./gradlew clean assemble)
 
+library:
+	(./gradlew clean assemble)
+	(mkdir -p dist)
+	(cp -R app/build/intermediates/stripped_native_libs/release/out/lib/ dist)
+	(cp app/build/intermediates/dex/release/minifyReleaseWithR8/classes.dex dist)

src/platform/android/app/build.gradle

@@ -11,7 +11,7 @@ android {
     targetSdkVersion 30
     versionCode 50
     versionName "12.23"
-    resConfigs "en"
+    resConfigs 'en'
   }
 
   signingConfigs {

src/platform/android/app/src/main/assets/main.bas

@@ -114,7 +114,7 @@ sub do_about()
   color colText
   print "Version "; sbver
   print
-  print "Copyright (c) 2002-2021 Chris Warren-Smith"
+  print "Copyright (c) 2002-2022 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nicholas Christopoulos" + chr(10)
 
   local bn_home