GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Android runtime

Browse Source
This commit is contained in:
Wojtek Figat
2024-01-04 09:03:39 +01:00
parent c7baded2db
commit e04c98020c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java
View File

@@ -44,7 +44,7 @@ public class GameActivity extends NativeActivity {
static { static {
try { try {
// Load native libraries // Load native libraries
System.loadLibrary("FlaxEngine"); System.loadLibrary("FlaxGame");
} catch (UnsatisfiedLinkError error) { } catch (UnsatisfiedLinkError error) {
Log.e("Flax", error.getMessage()); Log.e("Flax", error.getMessage());
} }

7
Source/Tools/Flax.Build/Build/EngineTarget.cs
View File

@@ -128,7 +128,7 @@ namespace Flax.Build
base.PostBuild(graph, buildOptions); base.PostBuild(graph, buildOptions);
// If building engine executable for platform doesn't support referencing it when linking game shared libraries // If building engine executable for platform doesn't support referencing it when linking game shared libraries
if (UseSeparateMainExecutable(buildOptions) && !BuildAsLibrary(buildOptions)) if (UseSeparateMainExecutable(buildOptions))
{ {
// Build additional executable with Main module only that uses shared library // Build additional executable with Main module only that uses shared library
using (new ProfileEventScope("BuildExecutable")) using (new ProfileEventScope("BuildExecutable"))
@@ -148,6 +148,8 @@ namespace Flax.Build
{ {
if (OutputType == TargetOutputType.Executable && !Configuration.BuildBindingsOnly) if (OutputType == TargetOutputType.Executable && !Configuration.BuildBindingsOnly)
{ {
if (buildOptions.Platform.Target == TargetPlatform.Android)
return false;
if (!buildOptions.Platform.HasModularBuildSupport) if (!buildOptions.Platform.HasModularBuildSupport)
return false; return false;
return !IsMonolithicExecutable || (!buildOptions.Platform.HasExecutableFileReferenceSupport && UseSymbolsExports); return !IsMonolithicExecutable || (!buildOptions.Platform.HasExecutableFileReferenceSupport && UseSymbolsExports);
@@ -159,8 +161,7 @@ namespace Flax.Build
{ {
switch (buildOptions.Platform.Target) switch (buildOptions.Platform.Target)
{ {
case TargetPlatform.UWP: case TargetPlatform.UWP: return true;
case TargetPlatform.Android: return true;
default: return false; default: return false;
} }
} }