diff --git a/src/LibRyujinx.NativeSample/LibRyujinxInterop.cs b/src/LibRyujinx.NativeSample/LibRyujinxInterop.cs index a177d2191..e3d841fcc 100644 --- a/src/LibRyujinx.NativeSample/LibRyujinxInterop.cs +++ b/src/LibRyujinx.NativeSample/LibRyujinxInterop.cs @@ -10,7 +10,7 @@ namespace LibRyujinx.Sample { internal static class LibRyujinxInterop { - private const string dll = "LibRyujinx.Shared.dll"; + private const string dll = "LibRyujinx.dll"; [DllImport(dll, EntryPoint = "initialize")] public extern static bool Initialize(IntPtr path); diff --git a/src/LibRyujinx/LibRyujinx.cs b/src/LibRyujinx/LibRyujinx.cs index 4d2097e02..235d3e4a4 100644 --- a/src/LibRyujinx/LibRyujinx.cs +++ b/src/LibRyujinx/LibRyujinx.cs @@ -83,7 +83,7 @@ namespace LibRyujinx Logger.SetEnable(LogLevel.AccessLog, false); Logger.AddTarget(new AsyncLogTargetWrapper( - new FileLogTarget(basePath, "file"), + new FileLogTarget(AppDataManager.BaseDirPath, "file"), 1000, AsyncLogTargetOverflowAction.Block )); diff --git a/src/LibRyujinx/LibRyujinx.csproj b/src/LibRyujinx/LibRyujinx.csproj index 0d4cbf603..b8e09365b 100644 --- a/src/LibRyujinx/LibRyujinx.csproj +++ b/src/LibRyujinx/LibRyujinx.csproj @@ -3,7 +3,8 @@ net8.0 enable - lld + lld + $(DefineConstants);FORCE_EXTERNAL_BASE_DIR true @@ -32,7 +33,7 @@ - + diff --git a/src/Ryujinx.Common/ReleaseInformation.cs b/src/Ryujinx.Common/ReleaseInformation.cs index ab65a98f3..4118f79a0 100644 --- a/src/Ryujinx.Common/ReleaseInformation.cs +++ b/src/Ryujinx.Common/ReleaseInformation.cs @@ -35,7 +35,20 @@ namespace Ryujinx.Common return BuildVersion; } - return Assembly.GetEntryAssembly().GetCustomAttribute().InformationalVersion; + if (SystemInfo.SystemInfo.IsBionic) + { + return "Android_1.0"; + } + + try + { + return Assembly.GetEntryAssembly().GetCustomAttribute().InformationalVersion; + } + catch (Exception _) + { + return "Native"; + } + } #if FORCE_EXTERNAL_BASE_DIR @@ -46,7 +59,7 @@ namespace Ryujinx.Common #else public static string GetBaseApplicationDirectory() { - if (IsFlatHubBuild() || OperatingSystem.IsMacOS()) + if (IsFlatHubBuild() || OperatingSystem.IsMacOS() || SystemInfo.SystemInfo.IsBionic) { return AppDataManager.BaseDirPath; }