[pull] master from DCurrent:master

.gitignore

@@ -4,6 +4,7 @@
 OpenBOR.elf
 meta.xml
 /engine/version.h
+/engine/version.txt
 /engine/resources/Info.plist
 engine/releases/
 /engine/ide/vs/.vs/
@@ -17,7 +18,6 @@ tools/win-sdk/*
 tools/psp-sdk/*
 tools/devkitpro/*
 !tools/devkitpro/devkitPro.7z
-engine/android/app/src/main/assets/bor.pak
 /openbor_vs
 engine/ios/Build
 **/.DS_Store

engine/Makefile

@@ -248,21 +248,17 @@ INCS += $(INCLUDES)
 ADPCM 	        = source/adpcmlib/adpcm.o
 
 ifdef BUILD_GFX
-GFX 	        = source/gfxlib/2xSaI.o                                                             \
-                  source/gfxlib/bilinear.o                                                          \
+GFX 	        = source/gfxlib/bilinear.o                                                          \
                   source/gfxlib/dotmatrix.o                                                         \
                   source/gfxlib/gfx.o                                                               \
-                  source/gfxlib/hq2x.o                                                              \
                   source/gfxlib/scale2x.o                                                           \
                   source/gfxlib/scanline.o                                                          \
                   source/gfxlib/simple2x.o                                                          \
                   source/gfxlib/tv2x.o
 endif
 
 ifdef BUILD_MMX
-GFX 	       += source/gfxlib/2xSaImmx.o                                                          \
-                  source/gfxlib/bilinearmmx.o                                                       \
-                  source/gfxlib/hq2x16mmx.o
+GFX 	       += source/gfxlib/bilinearmmx.o
 endif
 
 GAME	        = source/gamelib/draw.o                                                             \

engine/android/.gitignore

@@ -6,3 +6,5 @@
 /build
 /keystore.properties
 *.jks
+/app/local.properties
+/app/src/main/assets/*.pak

engine/android/README

@@ -1,5 +1,5 @@
 ##############################################
-# Msmalik681 Windows 64 bit Build instructions
+# Windows 64 bit Build instructions
 ##############################################
 
 First Download and install JAVA JDK 11. once installed open a command promt window and type "java -version" if it confirms you have java 11 installed.
@@ -9,14 +9,12 @@ Now download the Android SDK but be sure to get the "command line tools only" pa
 Finally go to the android folder in the source code and run build.bat. If it is the first time it will take time to download everything.
 
 ############################################
-# Msmalik681 Linux 64 bit Build instructions
+# Linux 64 bit Build instructions
 ############################################
 
-make sure you have java 11 installed check in terminal with "java --version" you can use openjdk 11.
+run openbor/engine/android/build.sh it will download everything needed and build openbor debug apk.
 
-(Optional) Download Android SDK but be sure to get the "command line tools only" and extract to "~/.android" now youo should have the path "~/.android/cmdline-tools/sdkmanager".
-
-Finally go to the android folder in the source code and run ./build.sh it will take a time to download everything if this is the first run.
+incase the downloads are broken download "commandlinetools-linux-13114758_latest.zip" and "openjdk-17.0.1_linux-x64_bin.zip" extract both to "~/.android" before you run build.sh.
 
 #########################
 # Custom Apk instructions
@@ -106,5 +104,5 @@ Anyway for debugging and development, you can
 # Development Notes
 ###################
 
-* Minimum SDK (API Level) is 16 at the moment
+* Minimum SDK (API Level) is 21 at the moment
 * Support building for two architectures (with included pre-built libraries) arm64-v8a, and armeabi-v7a.

engine/android/app/.cxx/abi_configuration_5u53tc49.json

@@ -0,0 +1,10 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a"
+  ],
+  "validAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A"
+  ]
+}

engine/android/app/.cxx/abi_configuration_5u53tc49.log

@@ -0,0 +1 @@
+[]

engine/android/app/.cxx/abi_configuration_5u53tc49_key.json

@@ -0,0 +1,21 @@
+{
+  "ndkHandlerSupportedAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "ndkHandlerDefaultAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "externalNativeBuildAbiFilters": [
+    "armeabi-v7a",
+    "arm64-v8a"
+  ],
+  "ndkConfigAbiFilters": [],
+  "splitsFilterAbis": [],
+  "ideBuildOnlyTargetAbi": true
+}

engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build.json

@@ -0,0 +1,90 @@
+{
+  "buildFiles": [
+    "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+    "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk"
+  ],
+  "cleanCommandsComponents": [
+    [
+      "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+      "NDK_PROJECT_PATH\u003dnull",
+      "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+      "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+      "APP_ABI\u003darm64-v8a",
+      "NDK_ALL_ABIS\u003darm64-v8a",
+      "NDK_DEBUG\u003d1",
+      "APP_PLATFORM\u003dandroid-21",
+      "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+      "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+      "APP_PLATFORM\u003dandroid-21",
+      "clean"
+    ]
+  ],
+  "buildTargetsCommandComponents": [
+    "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+    "NDK_PROJECT_PATH\u003dnull",
+    "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+    "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+    "APP_ABI\u003darm64-v8a",
+    "NDK_ALL_ABIS\u003darm64-v8a",
+    "NDK_DEBUG\u003d1",
+    "APP_PLATFORM\u003dandroid-21",
+    "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+    "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+    "APP_PLATFORM\u003dandroid-21",
+    "{LIST_OF_TARGETS_TO_BUILD}"
+  ],
+  "libraries": {
+    "cpufeatures-debug-arm64-v8a": {
+      "buildCommandComponents": [
+        "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+        "NDK_PROJECT_PATH\u003dnull",
+        "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+        "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+        "APP_ABI\u003darm64-v8a",
+        "NDK_ALL_ABIS\u003darm64-v8a",
+        "NDK_DEBUG\u003d1",
+        "APP_PLATFORM\u003dandroid-21",
+        "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+        "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+        "APP_PLATFORM\u003dandroid-21",
+        "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a"
+      ],
+      "toolchain": "toolchain-arm64-v8a",
+      "abi": "arm64-v8a",
+      "artifactName": "cpufeatures",
+      "output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a"
+    },
+    "openbor-debug-arm64-v8a": {
+      "buildCommandComponents": [
+        "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+        "NDK_PROJECT_PATH\u003dnull",
+        "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+        "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+        "APP_ABI\u003darm64-v8a",
+        "NDK_ALL_ABIS\u003darm64-v8a",
+        "NDK_DEBUG\u003d1",
+        "APP_PLATFORM\u003dandroid-21",
+        "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+        "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+        "APP_PLATFORM\u003dandroid-21",
+        "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so"
+      ],
+      "toolchain": "toolchain-arm64-v8a",
+      "abi": "arm64-v8a",
+      "artifactName": "openbor",
+      "output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so"
+    }
+  },
+  "toolchains": {
+    "toolchain-arm64-v8a": {
+      "cCompilerExecutable": "/home/malik/.android/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/clang",
+      "cppCompilerExecutable": "/home/malik/.android/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++"
+    }
+  },
+  "cFileExtensions": [
+    "c"
+  ],
+  "cppFileExtensions": [
+    "cpp"
+  ]
+}

engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build_command_openbor_arm64-v8a.txt

@@ -0,0 +1,15 @@
+Executable : /home/malik/.android/ndk/21.4.7075529/ndk-build
+arguments : 
+NDK_PROJECT_PATH=null
+APP_BUILD_SCRIPT=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk
+NDK_APPLICATION_MK=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk
+APP_ABI=arm64-v8a
+NDK_ALL_ABIS=arm64-v8a
+NDK_DEBUG=1
+APP_PLATFORM=android-21
+NDK_OUT=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj
+NDK_LIBS_OUT=/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib
+APP_PLATFORM=android-21
+openbor
+jvmArgs : 
+

engine/android/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build_mini.json

@@ -0,0 +1,78 @@
+{
+  "buildFiles": [
+    "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+    "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk"
+  ],
+  "cleanCommandsComponents": [
+    [
+      "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+      "NDK_PROJECT_PATH\u003dnull",
+      "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+      "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+      "APP_ABI\u003darm64-v8a",
+      "NDK_ALL_ABIS\u003darm64-v8a",
+      "NDK_DEBUG\u003d1",
+      "APP_PLATFORM\u003dandroid-21",
+      "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+      "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+      "APP_PLATFORM\u003dandroid-21",
+      "clean"
+    ]
+  ],
+  "buildTargetsCommandComponents": [
+    "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+    "NDK_PROJECT_PATH\u003dnull",
+    "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+    "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+    "APP_ABI\u003darm64-v8a",
+    "NDK_ALL_ABIS\u003darm64-v8a",
+    "NDK_DEBUG\u003d1",
+    "APP_PLATFORM\u003dandroid-21",
+    "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+    "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+    "APP_PLATFORM\u003dandroid-21",
+    "{LIST_OF_TARGETS_TO_BUILD}"
+  ],
+  "libraries": {
+    "cpufeatures-debug-arm64-v8a": {
+      "artifactName": "cpufeatures",
+      "buildCommandComponents": [
+        "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+        "NDK_PROJECT_PATH\u003dnull",
+        "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+        "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+        "APP_ABI\u003darm64-v8a",
+        "NDK_ALL_ABIS\u003darm64-v8a",
+        "NDK_DEBUG\u003d1",
+        "APP_PLATFORM\u003dandroid-21",
+        "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+        "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+        "APP_PLATFORM\u003dandroid-21",
+        "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a"
+      ],
+      "abi": "arm64-v8a",
+      "output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libcpufeatures.a",
+      "runtimeFiles": []
+    },
+    "openbor-debug-arm64-v8a": {
+      "artifactName": "openbor",
+      "buildCommandComponents": [
+        "/home/malik/.android/ndk/21.4.7075529/ndk-build",
+        "NDK_PROJECT_PATH\u003dnull",
+        "APP_BUILD_SCRIPT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Android.mk",
+        "NDK_APPLICATION_MK\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/jni/Application.mk",
+        "APP_ABI\u003darm64-v8a",
+        "NDK_ALL_ABIS\u003darm64-v8a",
+        "NDK_DEBUG\u003d1",
+        "APP_PLATFORM\u003dandroid-21",
+        "NDK_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj",
+        "NDK_LIBS_OUT\u003d/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/lib",
+        "APP_PLATFORM\u003dandroid-21",
+        "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so"
+      ],
+      "abi": "arm64-v8a",
+      "output": "/home/malik/Desktop/openbor_android_port/openbor-master/engine/android/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libopenbor.so",
+      "runtimeFiles": []
+    }
+  }
+}