Added Android build very wip

.github/workflows/main.yml

@@ -375,3 +375,34 @@ jobs:
             config.yml
             assets
             gamecontrollerdb.txt
+
+  build-android:
+    needs: generate-port-o2r
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: sudo apt-get install -y ninja-build
+    - name: Download spaghetti.o2r
+      uses: actions/download-artifact@v4
+      with:
+        name: spaghetti.o2r
+        path: android/app/src/main/assets 
+    - name: Copy yamls folder to assets
+      run: |
+        mkdir -p android/app/src/main/assets/yamls
+        cp -r yamls/* android/app/src/main/assets/yamls/
+    - name: Configure Gradle permissions
+      run: chmod +x android/gradlew
+    - name: Build Spaghetti Kart
+      run: |
+        cd android/
+        ./gradlew assembleDebug -P elfBuildType=RelWithDebInfo
+        mv app/build/outputs/apk/debug/app-debug.apk ../spaghettikart.apk
+    - name: Upload APK artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: spaghetti-kart-apk
+        path: spaghettikart.apk

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "torch"]
 	path = torch
 	url = https://github.com/HarbourMasters/Torch
-[submodule "libultraship"]
-	path = libultraship
-	url = https://github.com/Kenix3/libultraship
 [submodule "lib/wasm-micro-runtime"]
 	path = lib/wasm-micro-runtime
 	url = https://github.com/bytecodealliance/wasm-micro-runtime.git

CMakeLists.txt

@@ -124,7 +124,7 @@ endif()
 ################################################################################
 # Global configuration types
 ################################################################################
-if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch|Android")
 set(CMAKE_C_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
 set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
@@ -158,7 +158,7 @@ add_compile_definitions(
 )
 
 # Find necessary libraries
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE AND NOT ANDROID)
 find_package(OpenGL REQUIRED)
 endif()
 
@@ -248,7 +248,9 @@ list(APPEND ALL_FILES ${ALL_FILES_ROOT})
 list(FILTER ALL_FILES EXCLUDE REGEX ".*.inc.c")
 list(FILTER ALL_FILES EXCLUDE REGEX "./src/debug/crash_screen_enhancement.c")
 
-if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if(ANDROID)
+    add_library(${PROJECT_NAME} SHARED ${ALL_FILES})
+elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
     set(IOS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/ios)
 
     set(STORYBOARD_FILE ${IOS_DIR}/Launch.storyboard)
@@ -326,7 +328,7 @@ include_directories(${STB_DIR})
 set(EXCLUDE_MPQ_SUPPORT TRUE CACHE BOOL "")
 add_compile_definitions(EXCLUDE_MPQ_SUPPORT)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+if(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch|Android")
     find_package(SDL2)
 endif()
 
@@ -430,6 +432,14 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
         "Vorbis::vorbisenc"
         "Vorbis::vorbisfile"
     )
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package(Threads REQUIRED)
+    set(ADDITIONAL_LIBRARY_DEPENDENCIES
+        "libultraship;"
+        SDL2::SDL2
+        Threads::Threads
+    )
 elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
     set(ADDITIONAL_LIBRARY_DEPENDENCIES
         -lglad
@@ -460,7 +470,7 @@ if(USE_NETWORKING)
     endif()
     include_directories(${SDL2_NET_INCLUDE_DIRS})
     target_compile_definitions(${PROJECT_NAME} PRIVATE USE_NETWORKING)
-    if(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+    if(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch|Android")
         target_link_libraries(${PROJECT_NAME} PRIVATE SDL2_net)
     elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
         find_package(SDL2_net REQUIRED)
@@ -657,6 +667,28 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
               -Wno-stringop-overflow
           >
       )
+   elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            -O2
+
+            -Wno-error
+            -Wno-format-security
+            -Wno-multichar
+            -Wno-return-type
+            -Wno-narrowing
+            -Wno-switch-outside-range
+            $<$<COMPILE_LANGUAGE:C>:
+                -Werror-implicit-function-declaration
+                -Wno-incompatible-pointer-types
+                -Wno-discarded-array-qualifiers
+                -Wno-discarded-qualifiers
+                -Wno-int-conversion
+                -Wno-builtin-declaration-mismatch
+                -Wno-switch-unreachable
+                -Wno-stringop-overflow
+                -Wno-implicit-int
+            >
+        )   
   else()
       if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
         set(CPU_OPTION -msse2 -mfpmath=sse)
@@ -762,5 +794,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
     set(CPACK_GENERATOR "Bundle")
 endif()
 
-set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/cmake/configure-packaging.cmake)
-include(cmake/packaging.cmake)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
+    set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/CMake/Packaging-2.cmake)
+    include(cmake/packaging.cmake)
+endif()

android/.gitignore

@@ -0,0 +1,34 @@
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+app/release/
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

android/app/build.gradle

@@ -0,0 +1,90 @@
+def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
+def buildAsApplication = !buildAsLibrary
+if (buildAsApplication) {
+    apply plugin: 'com.android.application'
+}
+else {
+    apply plugin: 'com.android.library'
+}
+
+android {
+    namespace("com.izzy.kart")
+    buildFeatures {
+        buildConfig true
+    }
+    ndkVersion "26.0.10792818"
+    compileSdkVersion 33
+    defaultConfig {
+        if (buildAsApplication) {
+            applicationId "com.izzy.kart"
+        }
+        minSdkVersion 24
+        targetSdkVersion 33
+        versionCode 5
+        versionName "1.0.0"
+        externalNativeBuild {
+            //ndkBuild {
+            //    arguments "APP_PLATFORM=android-23"
+            //    abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            //}
+            cmake {
+                 arguments "-DSDL_SHARED=ON", "-DANDROID_STL=c++_static", "-DHAVE_LD_VERSION_SCRIPT=OFF",'-DUSE_OPENGLES=ON'
+                 //abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                 abiFilters 'arm64-v8a'
+            }
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    applicationVariants.all { variant ->
+        tasks["merge${variant.name.capitalize()}Assets"]
+            .dependsOn("externalNativeBuild${variant.name.capitalize()}")
+    }
+    if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
+        sourceSets.main {
+            jniLibs.srcDir 'libs'
+        }
+        externalNativeBuild {
+            //ndkBuild {
+            //    path 'jni/Android.mk'
+            //}
+            cmake {
+                 path '../../CMakeLists.txt'
+                 version "3.31.5"
+            }
+        }
+
+    }
+    lintOptions {
+        abortOnError false
+    }
+
+    if (buildAsLibrary) {
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith(".aar")) {
+                    def fileName = "org.libsdl.app.aar";
+                    output.outputFile = new File(outputFile.parent, fileName);
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.core:core:1.7.0' // Use the latest version
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '8.3.2'
+}
+
+task prepareKotlinBuildScriptModel {
+}

android/app/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists