mirror of
https://github.com/raylib-cs/raylib-cs
synced 2025-04-03 11:09:40 -04:00
Add experimental Android support (#190)
* Add `Raylib-cs.Android` project * Update ci to handle android native libraries * Update ci to pack android project
This commit is contained in:
Angga Permana
GitHub
parent
23ed54cc24
commit
5ae2104c9a
80
.github/workflows/build.yml
vendored
80
.github/workflows/build.yml
vendored
@ -22,8 +22,52 @@ jobs:
|
||||
id: version
|
||||
shell: bash
|
||||
run: |
|
||||
echo "version=$(sed -n 's/.*<TargetRaylibTag>\(.*\)<\/TargetRaylibTag>.*/\1/p' Raylib-cs/Raylib-cs.csproj)">> ${GITHUB_OUTPUT}
|
||||
echo "pkgversion=$(sed -n 's/.*<PackageVersion>\(.*\)<\/PackageVersion>.*/\1/p' Raylib-cs/Raylib-cs.csproj)">> ${GITHUB_OUTPUT}
|
||||
echo "version=$(sed -n 's/.*<TargetRaylibTag>\(.*\)<\/TargetRaylibTag>.*/\1/p' Directory.Build.props)">> ${GITHUB_OUTPUT}
|
||||
echo "pkgversion=$(sed -n 's/.*<PackageVersion>\(.*\)<\/PackageVersion>.*/\1/p' Directory.Build.props)">> ${GITHUB_OUTPUT}
|
||||
|
||||
build-android:
|
||||
runs-on: ubuntu-latest
|
||||
needs: prepare
|
||||
strategy:
|
||||
matrix:
|
||||
name: [arm, arm64, x86, x64]
|
||||
include:
|
||||
- name: arm
|
||||
arch: armeabi-v7a
|
||||
- name: arm64
|
||||
arch: arm64-v8a
|
||||
- name: x86
|
||||
arch: x86
|
||||
- name: x64
|
||||
arch: x86_64
|
||||
steps:
|
||||
- name: checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: build raylib
|
||||
env:
|
||||
version: ${{ needs.prepare.outputs.version }}
|
||||
run: |
|
||||
curl -Lso raylib.zip https://github.com/raysan5/raylib/archive/refs/tags/${version}.zip
|
||||
unzip -qq raylib.zip
|
||||
pushd raylib-${version}; patch -p1 < ../Raylib-cs.Android/android.patch; popd
|
||||
cmake -S raylib-${version} \
|
||||
-B build \
|
||||
-D CMAKE_BUILD_TYPE=Release \
|
||||
-D BUILD_SHARED_LIBS=ON \
|
||||
-D BUILD_EXAMPLES=OFF \
|
||||
-D CMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
|
||||
-D PLATFORM=Android \
|
||||
-D ANDROID_ABI=${{ matrix.arch }} \
|
||||
-D ANDROID_PLATFORM=21
|
||||
cmake --build build --config Release
|
||||
|
||||
- name: upload build
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: android-${{ matrix.name }}
|
||||
path: build/raylib/libraylib.so
|
||||
if-no-files-found: error
|
||||
|
||||
build-linux:
|
||||
runs-on: ubuntu-latest
|
||||
@ -133,6 +177,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- prepare
|
||||
- build-android
|
||||
- build-linux
|
||||
- build-osx
|
||||
- build-windows
|
||||
@ -140,6 +185,26 @@ jobs:
|
||||
- name: checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: android-arm
|
||||
path: Raylib-cs.Android/runtimes/android-arm/native
|
||||
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: android-arm64
|
||||
path: Raylib-cs.Android/runtimes/android-arm64/native
|
||||
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: android-x86
|
||||
path: Raylib-cs.Android/runtimes/android-x86/native
|
||||
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: android-x64
|
||||
path: Raylib-cs.Android/runtimes/android-x64/native
|
||||
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: linux-x64
|
||||
@ -170,23 +235,26 @@ jobs:
|
||||
with:
|
||||
dotnet-version: 6.0.x
|
||||
|
||||
- name: Restore workload
|
||||
run: dotnet workload restore
|
||||
|
||||
- name: Create NuGet Package
|
||||
run: dotnet pack -c Release Raylib-cs
|
||||
run: dotnet pack -c Release --output nuget
|
||||
|
||||
- name: Upload NuGet Package As Artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
path: Raylib-cs/bin/Release/Raylib-cs.${{ needs.prepare.outputs.pkgversion }}.*pkg
|
||||
path: nuget/*
|
||||
|
||||
- name: Upload NuGet Package As Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
files: Raylib-cs/bin/Release/Raylib-cs.${{ needs.prepare.outputs.pkgversion }}.*pkg
|
||||
files: nuget/*
|
||||
|
||||
- name: Publish to NuGet
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: |
|
||||
dotnet nuget push \
|
||||
Raylib-cs/bin/Release/Raylib-cs.${{ needs.prepare.outputs.pkgversion }}.nupkg \
|
||||
nuget/* \
|
||||
--api-key ${{secrets.NUGET_API_KEY}}
|
||||
|
||||
9
Directory.Build.props
Normal file
9
Directory.Build.props
Normal file
@ -0,0 +1,9 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetRaylibTag>4.5.0</TargetRaylibTag>
|
||||
<Version>4.5.0.4</Version>
|
||||
<PackageVersion>4.5.0.4</PackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
15
Raylib-cs.Android/Raylib-cs.Android.csproj
Normal file
15
Raylib-cs.Android/Raylib-cs.Android.csproj
Normal file
@ -0,0 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0-android;net7.0-android</TargetFrameworks>
|
||||
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
|
||||
<RootNamespace>Raylib_cs</RootNamespace>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../Raylib-cs/Raylib-cs.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
17
Raylib-cs.Android/RaylibActivity.cs
Normal file
17
Raylib-cs.Android/RaylibActivity.cs
Normal file
@ -0,0 +1,17 @@
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Raylib_cs;
|
||||
|
||||
public abstract class RaylibActivity : NativeActivity
|
||||
{
|
||||
protected override void OnCreate(Bundle? savedInstanceState)
|
||||
{
|
||||
base.OnCreate(savedInstanceState);
|
||||
RaylibSetAndroidCallback(OnReady);
|
||||
}
|
||||
|
||||
protected abstract void OnReady();
|
||||
|
||||
[DllImport(Raylib.NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||
private static extern void RaylibSetAndroidCallback(Action callback);
|
||||
}
|
||||
27
Raylib-cs.Android/android.patch
Normal file
27
Raylib-cs.Android/android.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff --git a/src/rcore.c b/src/rcore.c
|
||||
index eae4951..4400b22 100644
|
||||
--- a/src/rcore.c
|
||||
+++ b/src/rcore.c
|
||||
@@ -1,3 +1,22 @@
|
||||
+#if defined (PLATFORM_ANDROID)
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+typedef void (*RaylibAndroidCallback)();
|
||||
+static RaylibAndroidCallback _androidCallback = NULL;
|
||||
+
|
||||
+void RaylibSetAndroidCallback(RaylibAndroidCallback callback) {
|
||||
+ _androidCallback = callback;
|
||||
+}
|
||||
+
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ (void)argc;
|
||||
+ (void)argv;
|
||||
+ while (_androidCallback == NULL) {
|
||||
+ }
|
||||
+ _androidCallback();
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/**********************************************************************************************
|
||||
*
|
||||
* rcore - Basic functions to manage windows, OpenGL context and input on multiple platforms
|
||||
0
Raylib-cs.Android/runtimes/android-arm/native/.keep
Normal file
0
Raylib-cs.Android/runtimes/android-arm/native/.keep
Normal file
0
Raylib-cs.Android/runtimes/android-x64/native/.keep
Normal file
0
Raylib-cs.Android/runtimes/android-x64/native/.keep
Normal file
0
Raylib-cs.Android/runtimes/android-x86/native/.keep
Normal file
0
Raylib-cs.Android/runtimes/android-x86/native/.keep
Normal file
@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Raylib-cs", "Raylib-cs\Rayl
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Raylib-cs.Tests", "Raylib-cs.Tests\Raylib-cs.Tests.csproj", "{523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Raylib-cs.Android", "Raylib-cs.Android\Raylib-cs.Android.csproj", "{8C2B9C24-3926-4B3A-902C-6429CF4864AA}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -25,6 +27,18 @@ Global
|
||||
{523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Release|x64.Build.0 = Release|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{8C2B9C24-3926-4B3A-902C-6429CF4864AA}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -11,9 +11,6 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetRaylibTag>4.5.0</TargetRaylibTag>
|
||||
<Version>4.5.0.4</Version>
|
||||
<PackageVersion>4.5.0.4</PackageVersion>
|
||||
<Authors>Chris Dill, Raysan5</Authors>
|
||||
<PackProject>true</PackProject>
|
||||
<IncludeSymbols>true</IncludeSymbols>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user