Android port (#656)
* initial files * get building * proper paths & default to virtual mouse * Wrap gradle under cmake & build SDL3.aar run cmake with -DANDROID_NDK_PATH=/path/to/ndk to generate the .aar & run the gradle build if using Android Studio you will have to run the aar script manually(or do the cmake cmd) then put the normal cmake args inside '-PcmakeArgs="-DCMAKE_BUILD_TYPE=Release ...."' at `Settings > Build, Execution, Deployment > Gradle-Android Compiler > Command-line Options` Check CMakeLists.txt Android build block for more info * workflow and format * dont cmake -> gradle -> cmake * icons * prevent first start crash due to missing isle.ini dont force require gles3 (vulkan & software are options) * cleanup * cmake script & ci cleanup use a cmake script to downoad SDL3 sources for aar building * script cleanups & gradle stub for android studio handle the env var setting for the sdl3 aar build script * signing needed repository secrets: - keystore : key.jks in base64 - keystorePassword : Key store password - keyAlias : Key alias, ex key0 - keyPassword : Key Password * conditionally run action without keys * compile SDL once & cross-platformize gradle tasks * suggestions * use find_package over manual configuration * use MxString --------- Co-authored-by: Anders Jenbo <anders@jenbo.dk> Co-authored-by: Christian Semmler <mail@csemmler.com>
45
.github/workflows/ci.yml
vendored
@ -47,6 +47,7 @@ jobs:
|
||||
- { name: 'Emscripten', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, emsdk: true, werror: true, clang-tidy: false, cmake-wrapper: 'emcmake' }
|
||||
- { name: 'Nintendo 3DS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, n3ds: true, werror: true, clang-tidy: false, container: 'devkitpro/devkitarm:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake' }
|
||||
- { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 17 2022', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true}
|
||||
- { name: 'Android', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, android: true, werror: true, clang-tidy: false,}
|
||||
steps:
|
||||
- name: Setup vcvars
|
||||
if: ${{ !!matrix.msvc }}
|
||||
@ -112,7 +113,41 @@ jobs:
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Java (Android)
|
||||
if: ${{ matrix.android }}
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: '17'
|
||||
|
||||
- name: Get CMake (Android)
|
||||
if: ${{ matrix.android }}
|
||||
uses: lukka/get-cmake@latest
|
||||
with:
|
||||
cmakeVersion: 3.30.5
|
||||
|
||||
- name: Build (Android)
|
||||
if: ${{ matrix.android }}
|
||||
env:
|
||||
SIGNING_KEY_ALIAS: ${{ secrets.keyAlias }}
|
||||
SIGNING_KEY_PASSWORD: ${{ secrets.keyPassword }}
|
||||
SIGNING_STORE_PASSWORD: ${{ secrets.keystorePassword }}
|
||||
SIGNING_STORE_FILE: ${{ github.workspace }}/release.keystore
|
||||
run: |
|
||||
echo "${{ secrets.keystore }}" | base64 -d > release.keystore
|
||||
cd android-project
|
||||
./gradlew $([ -n "$SIGNING_KEY_ALIAS" ] && echo packageRelease || echo assembleDebug ) \
|
||||
--info \
|
||||
-PcmakeArgs="-DCMAKE_BUILD_TYPE=Release \
|
||||
-DISLE_USE_DX5=${{ !!matrix.dx5 }} \
|
||||
-DISLE_BUILD_CONFIG=${{ !!matrix.config }} \
|
||||
-DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy }} \
|
||||
-DISLE_WERROR=${{ !!matrix.werror }} \
|
||||
-DISLE_DEBUG=${{ matrix.debug || 'OFF' }} \
|
||||
-Werror=dev"
|
||||
|
||||
- name: Configure (CMake)
|
||||
if: ${{ !matrix.android }}
|
||||
run: |
|
||||
${{ matrix.cmake-wrapper || '' }} cmake -S . -B build -G "${{ matrix.generator }}" \
|
||||
${{ matrix.cmake-args || '' }} \
|
||||
@ -126,10 +161,11 @@ jobs:
|
||||
-Werror=dev
|
||||
|
||||
- name: Build (CMake)
|
||||
if: ${{ !matrix.android }}
|
||||
run: cmake --build build --verbose --config Release
|
||||
|
||||
- name: Package (CPack)
|
||||
if: ${{ !matrix.n3ds }}
|
||||
if: ${{ !matrix.n3ds && !matrix.android }}
|
||||
run: |
|
||||
cd build
|
||||
success=0
|
||||
@ -178,6 +214,12 @@ jobs:
|
||||
mv *.3dsx dist/
|
||||
mv *.cia dist/
|
||||
|
||||
- name: Package (Android)
|
||||
if: ${{ matrix.android }}
|
||||
run: |
|
||||
mkdir -p build/dist
|
||||
mv android-project/app/build/outputs/apk/*/*.apk build/dist/
|
||||
|
||||
- name: Package Assets Separately
|
||||
if: matrix.build-assets
|
||||
run: (cd build/assets && zip -r ../dist/isle-assets.zip .)
|
||||
@ -191,6 +233,7 @@ jobs:
|
||||
build/dist/*.AppImage
|
||||
build/dist/*.3dsx
|
||||
build/dist/*.cia
|
||||
build/dist/*.apk
|
||||
|
||||
flatpak:
|
||||
name: "Flatpak (${{ matrix.arch }})"
|
||||
|
||||
2
.gitignore
vendored
@ -6,12 +6,14 @@ Release/
|
||||
/.idea
|
||||
.env
|
||||
.venv
|
||||
.gradle
|
||||
env/
|
||||
venv/
|
||||
ENV/
|
||||
VENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
local.properties
|
||||
/build/
|
||||
/build_debug/
|
||||
/legobin/
|
||||
|
||||
@ -73,22 +73,28 @@ if (DOWNLOAD_DEPENDENCIES)
|
||||
# FetchContent downloads and configures dependencies
|
||||
message(STATUS "Fetching SDL3 and iniparser. This might take a while...")
|
||||
include(FetchContent)
|
||||
if (WINDOWS_STORE)
|
||||
FetchContent_Declare(
|
||||
SDL3
|
||||
GIT_REPOSITORY "https://github.com/Helloyunho/SDL3-uwp.git"
|
||||
GIT_TAG "main"
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
|
||||
if(ANDROID)
|
||||
# Built by Gradle
|
||||
find_package(SDL3 REQUIRED CONFIG COMPONENTS Shared)
|
||||
else()
|
||||
FetchContent_Declare(
|
||||
if (WINDOWS_STORE)
|
||||
FetchContent_Declare(
|
||||
SDL3
|
||||
GIT_REPOSITORY "https://github.com/Helloyunho/SDL3-uwp.git"
|
||||
GIT_TAG "main"
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
else()
|
||||
FetchContent_Declare(
|
||||
SDL3
|
||||
GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
|
||||
GIT_TAG "main"
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
)
|
||||
endif()
|
||||
FetchContent_MakeAvailable(SDL3)
|
||||
endif()
|
||||
FetchContent_MakeAvailable(SDL3)
|
||||
|
||||
FetchContent_Declare(
|
||||
iniparser
|
||||
@ -501,6 +507,13 @@ if (ISLE_EXTENSIONS)
|
||||
endif()
|
||||
|
||||
if (ISLE_BUILD_APP)
|
||||
|
||||
if (ANDROID)
|
||||
function(add_executable TARGET PLATFORM)
|
||||
add_library(${TARGET} SHARED ${ARGN})
|
||||
endfunction()
|
||||
endif()
|
||||
|
||||
add_executable(isle WIN32
|
||||
ISLE/res/isle.rc
|
||||
ISLE/isleapp.cpp
|
||||
@ -580,6 +593,11 @@ if (ISLE_BUILD_APP)
|
||||
ISLE/ios/config.cpp
|
||||
)
|
||||
endif()
|
||||
if (ANDROID)
|
||||
target_sources(isle PRIVATE
|
||||
ISLE/android/config.cpp
|
||||
)
|
||||
endif()
|
||||
if(Python3_FOUND)
|
||||
if(NOT DEFINED PYTHON_PIL_AVAILABLE)
|
||||
execute_process(
|
||||
@ -746,7 +764,7 @@ endif()
|
||||
set(install_extra_targets)
|
||||
if(DOWNLOAD_DEPENDENCIES)
|
||||
get_property(sdl3_type TARGET SDL3::SDL3 PROPERTY TYPE)
|
||||
if(sdl3_type STREQUAL "SHARED_LIBRARY")
|
||||
if(sdl3_type STREQUAL "SHARED_LIBRARY" AND NOT ANDROID)
|
||||
list(APPEND install_extra_targets "SDL3-shared")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
30
ISLE/android/config.cpp
Normal file
@ -0,0 +1,30 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "mxstring.h"
|
||||
|
||||
#include <SDL3/SDL_filesystem.h>
|
||||
#include <SDL3/SDL_log.h>
|
||||
#include <SDL3/SDL_system.h>
|
||||
#include <iniparser.h>
|
||||
|
||||
void Android_SetupDefaultConfigOverrides(dictionary* p_dictionary)
|
||||
{
|
||||
SDL_Log("Overriding default config for Android");
|
||||
|
||||
const char* data = SDL_GetAndroidExternalStoragePath();
|
||||
MxString savedata = MxString(data) + "/saves/";
|
||||
|
||||
if (!SDL_GetPathInfo(savedata.GetData(), NULL)) {
|
||||
SDL_CreateDirectory(savedata.GetData());
|
||||
}
|
||||
|
||||
iniparser_set(p_dictionary, "isle:diskpath", data);
|
||||
iniparser_set(p_dictionary, "isle:cdpath", data);
|
||||
iniparser_set(p_dictionary, "isle:mediapath", data);
|
||||
|
||||
iniparser_set(p_dictionary, "isle:savepath", savedata.GetData());
|
||||
|
||||
// Default to Virtual Mouse
|
||||
char buf[16];
|
||||
iniparser_set(p_dictionary, "isle:Touch Scheme", SDL_itoa(0, buf, 10));
|
||||
}
|
||||
8
ISLE/android/config.h
Normal file
@ -0,0 +1,8 @@
|
||||
#ifndef ANDROID_CONFIG_H
|
||||
#define ANDROID_CONFIG_H
|
||||
|
||||
#include "dictionary.h"
|
||||
|
||||
void Android_SetupDefaultConfigOverrides(dictionary* p_dictionary);
|
||||
|
||||
#endif // ANDROID_CONFIG_H
|
||||
@ -72,6 +72,10 @@
|
||||
#include "ios/config.h"
|
||||
#endif
|
||||
|
||||
#ifdef ANDROID
|
||||
#include "android/config.h"
|
||||
#endif
|
||||
|
||||
DECOMP_SIZE_ASSERT(IsleApp, 0x8c)
|
||||
|
||||
// GLOBAL: ISLE 0x410030
|
||||
@ -1027,6 +1031,13 @@ bool IsleApp::LoadConfig()
|
||||
{
|
||||
#ifdef IOS
|
||||
const char* prefPath = SDL_GetUserFolder(SDL_FOLDER_DOCUMENTS);
|
||||
#elif defined(ANDROID)
|
||||
// SDL_GetAndroidExternalStoragePath() returns without a trailing / resulting in "filesisle.ini" :(
|
||||
const char* androidPath = SDL_GetAndroidExternalStoragePath();
|
||||
size_t len = SDL_strlen(androidPath) + 2;
|
||||
char* prefPath = new char[len];
|
||||
SDL_strlcpy(prefPath, androidPath, len);
|
||||
SDL_strlcat(prefPath, "/", len);
|
||||
#else
|
||||
char* prefPath = SDL_GetPrefPath("isledecomp", "isle");
|
||||
#endif
|
||||
@ -1128,6 +1139,9 @@ bool IsleApp::LoadConfig()
|
||||
#endif
|
||||
#ifdef IOS
|
||||
IOS_SetupDefaultConfigOverrides(dict);
|
||||
#endif
|
||||
#ifdef ANDROID
|
||||
Android_SetupDefaultConfigOverrides(dict);
|
||||
#endif
|
||||
iniparser_dump_ini(dict, iniFP);
|
||||
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "New config written at '%s'", iniConfig);
|
||||
|
||||
5
android-project/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
.cxx
|
||||
.gradle
|
||||
local.properties
|
||||
build
|
||||
*.aar
|
||||
101
android-project/app/build.gradle
Normal file
@ -0,0 +1,101 @@
|
||||
plugins {
|
||||
id 'com.android.application'
|
||||
}
|
||||
def androidProject = projectDir.parentFile
|
||||
|
||||
android {
|
||||
namespace "org.legoisland.isle"
|
||||
compileSdk 35
|
||||
|
||||
defaultConfig {
|
||||
applicationId 'org.legoisland.isle'
|
||||
minSdk 21
|
||||
targetSdk 35
|
||||
versionCode 1
|
||||
versionName '1.0'
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_STL=c++_shared', "-DFETCHCONTENT_BASE_DIR=${androidProject}/build/_deps"
|
||||
if (project.hasProperty('cmakeArgs')) {
|
||||
project.cmakeArgs.split(" ").each {arg -> arguments arg}
|
||||
}
|
||||
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
|
||||
}
|
||||
}
|
||||
}
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
version "3.30.5"
|
||||
path '../../CMakeLists.txt'
|
||||
}
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
register("release") {
|
||||
enableV4Signing = true
|
||||
keyAlias = System.getenv("SIGNING_KEY_ALIAS")
|
||||
keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
|
||||
System.getenv("SIGNING_STORE_FILE")?.with { storeFile = file(it) }
|
||||
storePassword = System.getenv("SIGNING_STORE_PASSWORD")
|
||||
}
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled true
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
buildFeatures {
|
||||
prefab true
|
||||
}
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
def androidPath = System.getenv("ANDROID_HOME") ?: android.sdkDirectory
|
||||
def ndkPath = System.getenv("ANDROID_NDK_HOME") ?: android.ndkDirectory
|
||||
|
||||
tasks.named('compileSDL3AndroidArchive').configure {
|
||||
environment "ANDROID_HOME", androidPath
|
||||
environment "ANDROID_NDK_HOME", ndkPath
|
||||
}
|
||||
}
|
||||
|
||||
def aarDest = project.providers.provider { file("${projectDir}/libs/SDL3.aar") }
|
||||
tasks.register('downloadSDL3', Exec) {
|
||||
workingDir = androidProject
|
||||
commandLine 'cmake', '-P', 'downloadSDL3.cmake'
|
||||
}
|
||||
tasks.register('compileSDL3AndroidArchive', Exec) {
|
||||
workingDir = androidProject
|
||||
dependsOn(downloadSDL3)
|
||||
|
||||
def sdl3Dir = "build/_deps/sdl3-src"
|
||||
commandLine 'python', "${sdl3Dir}/build-scripts/build-release.py",
|
||||
'--actions', 'android',
|
||||
'--fast', '--force',
|
||||
"--root=${sdl3Dir}"
|
||||
|
||||
doLast {
|
||||
def aarFile = file("${androidProject}/${sdl3Dir}/build-android").listFiles().find {
|
||||
it.name.endsWith(".aar")
|
||||
}
|
||||
aarDest.get().parentFile.mkdirs()
|
||||
aarFile.renameTo(aarDest.get())
|
||||
}
|
||||
}
|
||||
tasks.register('ensureSDL3') {
|
||||
// if DOWNLOAD_DEPENDENCIES=OFF download the version appropriate
|
||||
// 'devel android zip' and place the .aar at `aarDest`
|
||||
if (aarDest.get().exists()) { return false }
|
||||
dependsOn(compileSDL3AndroidArchive)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation files('libs/SDL3.aar').builtBy(ensureSDL3)
|
||||
}
|
||||
60
android-project/app/src/main/AndroidManifest.xml
Normal file
@ -0,0 +1,60 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<!-- OpenGL ES 3.0 -->
|
||||
<uses-feature
|
||||
android:glEsVersion="0x00030000"
|
||||
android:required="false" />
|
||||
|
||||
<!-- Touchscreen support -->
|
||||
<uses-feature
|
||||
android:name="android.hardware.touchscreen"
|
||||
android:required="false" />
|
||||
|
||||
<!-- Game controller support -->
|
||||
<uses-feature
|
||||
android:name="android.hardware.bluetooth"
|
||||
android:required="false" />
|
||||
<uses-feature
|
||||
android:name="android.hardware.gamepad"
|
||||
android:required="false" />
|
||||
<uses-feature
|
||||
android:name="android.hardware.usb.host"
|
||||
android:required="false" />
|
||||
|
||||
<!-- External mouse input events -->
|
||||
<uses-feature
|
||||
android:name="android.hardware.type.pc"
|
||||
android:required="false" />
|
||||
|
||||
<!-- Allow access to the vibrator -->
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:hardwareAccelerated="true"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name="org.legoisland.isle.IsleActivity"
|
||||
android:exported="true"
|
||||
android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
|
||||
android:preferMinimalPostProcessing="true"
|
||||
android:screenOrientation="landscape"
|
||||
android:launchMode="singleInstance">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
BIN
android-project/app/src/main/ic_launcher-playstore.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
@ -0,0 +1,9 @@
|
||||
package org.legoisland.isle;
|
||||
|
||||
import org.libsdl.app.SDLActivity;
|
||||
|
||||
public class IsleActivity extends SDLActivity {
|
||||
protected String[] getLibraries() {
|
||||
return new String[] { "SDL3", "lego1", "isle" };
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,141 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="180"
|
||||
android:viewportHeight="180">
|
||||
<group android:scaleX="0.47"
|
||||
android:scaleY="0.47"
|
||||
android:translateX="47.7"
|
||||
android:translateY="47.7">
|
||||
<path
|
||||
android:pathData="M16.09,16.09m-16.09,0a16.09,16.09 0,1 1,32.18 0a16.09,16.09 0,1 1,-32.18 0"
|
||||
android:strokeWidth="6.09858"
|
||||
android:fillColor="#ffff00"/>
|
||||
<path
|
||||
android:pathData="M9.23,38.09L9.23,65.53"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="9.15"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="m66.61,9.11l-27.44,0"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="9.15"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="M21.86,39.44 L29.29,61.95"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="9.15"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="m33.06,32.76 l19.56,13.39"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="9.15"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="m38.74,20.71 l22.48,7.51"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="9.15"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="M31.84,157.94l131.47,0l0,18.05l-131.47,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="8.01"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M31.84,79.75l131.47,0l0,18.05l-131.47,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="8.01"
|
||||
android:fillColor="#ffff00"
|
||||
android:strokeColor="#ffff00"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M31.84,131.88l131.47,0l0,18.05l-131.47,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="8.01"
|
||||
android:fillColor="#ff0000"
|
||||
android:strokeColor="#ff0000"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M31.84,105.81l131.47,0l0,18.05l-131.47,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="8.01"
|
||||
android:fillColor="#0000ff"
|
||||
android:strokeColor="#0000ff"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M70.06,80.85l55.04,0l0,68.99l-55.04,0z"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="8.91"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#000000"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M72.74,85.31l20.36,0l0,24.52l-20.36,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="3.04"
|
||||
android:fillColor="#00ffff"
|
||||
android:strokeColor="#00ffff"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M101.96,85.31l20.36,0l0,24.52l-20.36,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="3.04"
|
||||
android:fillColor="#00ffff"
|
||||
android:strokeColor="#00ffff"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M72.89,116.22l20.06,0l0,30.02l-20.06,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="3.34"
|
||||
android:fillColor="#00ffff"
|
||||
android:strokeColor="#00ffff"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M102.11,116.22l20.06,0l0,30.02l-20.06,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="3.34"
|
||||
android:fillColor="#00ffff"
|
||||
android:strokeColor="#00ffff"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M131.19,7.33L131.19,55.6"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="4.57"
|
||||
android:fillColor="#ff0000"
|
||||
android:strokeColor="#000000"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="m111.99,3.21 l38.38,29.26"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="4.57"
|
||||
android:fillColor="#ff0000"
|
||||
android:strokeColor="#000000"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="m115.82,19.64 l30.2,23.02"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="4.57"
|
||||
android:fillColor="#ff0000"
|
||||
android:strokeColor="#000000"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="M19.99,75.94H173.06L150.4,51.32h-7.63l-5.02,6.19h-7.47l-4.27,-8.06h-7.59l-4.57,8.06h-8l-4.69,-8.06h-7.44l-4.18,8.06h-8.45l-3.9,-8.06h-7.23l-4.36,8.06h-8.61l-5.45,-6.19h-6.08z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="3.04929"
|
||||
android:fillColor="#ff0000"
|
||||
android:strokeColor="#ff0000"
|
||||
android:strokeLineCap="butt"/>
|
||||
</group>
|
||||
</vector>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
BIN
android-project/app/src/main/res/mipmap-hdpi/ic_launcher.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
BIN
android-project/app/src/main/res/mipmap-mdpi/ic_launcher.webp
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
BIN
android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Normal file
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
BIN
android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 7.5 KiB |
BIN
android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Normal file
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 10 KiB |
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#39A0D9</color>
|
||||
</resources>
|
||||
3
android-project/app/src/main/res/values/strings.xml
Normal file
@ -0,0 +1,3 @@
|
||||
<resources>
|
||||
<string name="app_name">Lego Island</string>
|
||||
</resources>
|
||||
8
android-project/app/src/main/res/values/styles.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<resources>
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
4
android-project/build.gradle
Normal file
@ -0,0 +1,4 @@
|
||||
plugins {
|
||||
id 'com.android.application' version '8.7.0' apply false
|
||||
id 'com.android.library' version '8.7.0' apply false
|
||||
}
|
||||
13
android-project/downloadSDL3.cmake
Normal file
@ -0,0 +1,13 @@
|
||||
cmake_minimum_required(VERSION 3.25...4.0 FATAL_ERROR)
|
||||
|
||||
include(FetchContent)
|
||||
|
||||
set(FETCHCONTENT_BASE_DIR "build/_deps")
|
||||
|
||||
FetchContent_Populate(
|
||||
SDL3
|
||||
GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
|
||||
GIT_TAG "main"
|
||||
SOURCE_DIR "build/_deps/sdl3-src"
|
||||
BINARY_DIR "build/_deps/sdl3-build"
|
||||
)
|
||||
21
android-project/gradle.properties
Normal file
@ -0,0 +1,21 @@
|
||||
# Project-wide Gradle settings.
|
||||
# IDE (e.g. Android Studio) users:
|
||||
# Gradle settings configured through the IDE *will override*
|
||||
# any settings specified in this file.
|
||||
# For more details on how to configure your build environment visit
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||
# Android operating system, and which are packaged with your app"s APK
|
||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||
android.useAndroidX=true
|
||||
# Enables namespacing of each library's R class so that its R class includes only the
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
android.nonTransitiveRClass=true
|
||||
BIN
android-project/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
5
android-project/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
185
android-project/gradlew
vendored
Executable file
@ -0,0 +1,185 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
89
android-project/gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
16
android-project/settings.gradle
Normal file
@ -0,0 +1,16 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
dependencyResolutionManagement {
|
||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
rootProject.name = "legoisland"
|
||||
include ':app'
|
||||
@ -44,7 +44,7 @@ if(NOT WINDOWS_STORE)
|
||||
message(STATUS "🧩 OpenGL 1.x support not enabled — needs OpenGL")
|
||||
endif()
|
||||
|
||||
find_library(OPENGL_ES3_LIBRARY NAMES GLESv2)
|
||||
find_library(OPENGL_ES3_LIBRARY NAMES GLESv3 GLESv2)
|
||||
if(EMSCRIPTEN OR OPENGL_ES3_LIBRARY)
|
||||
message(STATUS "Found OpenGL: enabling OpenGL ES 3.x renderer")
|
||||
target_sources(miniwin PRIVATE src/d3drm/backends/opengles3/renderer.cpp)
|
||||
|
||||
1
settings.gradle
Normal file
@ -0,0 +1 @@
|
||||
includeBuild('android-project')
|
||||