From ff96c5f42087d00ef0cdebf0c0a88231c9207b4a Mon Sep 17 00:00:00 2001 From: Ben Parsons <--global> Date: Fri, 8 May 2020 02:20:20 +1000 Subject: [PATCH] Added Platform.cs - to copy (correct) native library at runtime (for netfx) Targets file now copies runtimes folder to output directory minor bug fix in sln file. --- Raylib-cs.sln | 4 +- Raylib-cs/Platform.cs | 96 ++++++++++++++++++++++++++ Raylib-cs/Raylib-cs.csproj | 133 +++++++++++++++++++----------------- Raylib-cs/Raylib-cs.targets | 27 ++++---- 4 files changed, 182 insertions(+), 78 deletions(-) create mode 100644 Raylib-cs/Platform.cs diff --git a/Raylib-cs.sln b/Raylib-cs.sln index f5ddf0c..823188f 100644 --- a/Raylib-cs.sln +++ b/Raylib-cs.sln @@ -19,8 +19,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {B02C431E-271A-432E-BA5C-EE3B68DBF585}.Release|Any CPU.ActiveCfg = Release|Any CPU {B02C431E-271A-432E-BA5C-EE3B68DBF585}.Release|Any CPU.Build.0 = Release|Any CPU - {B02C431E-271A-432E-BA5C-EE3B68DBF585}.Debug|Any CPU.ActiveCfg = Debug|linux-x64 - {B02C431E-271A-432E-BA5C-EE3B68DBF585}.Debug|Any CPU.Build.0 = Debug|linux-x64 + {B02C431E-271A-432E-BA5C-EE3B68DBF585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B02C431E-271A-432E-BA5C-EE3B68DBF585}.Debug|Any CPU.Build.0 = Debug|Any CPU {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Release|Any CPU.ActiveCfg = Release|Any CPU {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 diff --git a/Raylib-cs/Platform.cs b/Raylib-cs/Platform.cs new file mode 100644 index 0000000..f1ba866 --- /dev/null +++ b/Raylib-cs/Platform.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Reflection; + +namespace Raylib_cs +{ + public static class Platform + { + public static readonly IReadOnlyDictionary SupportedPlatforms = + new Dictionary() + { + {"osx-x64", (PlatformID.MacOSX, true)}, + {"win-x64", (PlatformID.Win32NT, true)}, + {"win-x86", (PlatformID.Win32NT, false)}, + {"linux-x64", (PlatformID.Unix, true)}, + {"linux-x86", (PlatformID.Unix, false)}, + }; + + public static readonly List<(PlatformID, bool)> HasSupportedPlatformNativeLibrary = + new List<(PlatformID, bool)>(); + + public static string NativeLibrarySubfolder { get; set; } = "native"; + public static string RuntimeLibraryFolder { get; set; } = "runtimes"; + + private static void DiscoverNativeLibraries() + { + var localFolders = Directory.GetDirectories(Directory.GetCurrentDirectory()); + if (!localFolders.Any(d => + string.Equals(d, RuntimeLibraryFolder, StringComparison.InvariantCultureIgnoreCase))) return; + + // for each supported platform, see if the native library exists in the RuntimeLibraryFolder (for now this is any file that doesnt start with ".") + foreach (var platform in SupportedPlatforms) + { + var localPlatformFolder = localFolders.FirstOrDefault(f => + string.Equals(f, platform.Key, StringComparison.InvariantCultureIgnoreCase)); + + if (localPlatformFolder == default) continue; + + var localNativeLibraryFolder = Path.Combine(localPlatformFolder, NativeLibrarySubfolder); + + if (!Directory.Exists(localNativeLibraryFolder)) + continue; + + // if all the files in the NativeLibrarySubfolder start with "." then we have not found any native libraries + if (Directory.GetFiles(localNativeLibraryFolder).All(f => f[0] == '.')) continue; + + if (!HasSupportedPlatformNativeLibrary.Contains(platform.Value)) + HasSupportedPlatformNativeLibrary.Add(platform.Value); + } + } + + private static string DetectSystem() + { + Debug.WriteLine( + $"System info: {Environment.NewLine}" + + $"OS:{Environment.OSVersion.Platform:G}{Environment.NewLine}" + + $"ServicePack:{Environment.OSVersion.ServicePack}{Environment.NewLine}" + + $"Version:{Environment.OSVersion.Version}{Environment.NewLine}" + + $"64OS?:{Environment.Is64BitOperatingSystem}{Environment.NewLine}" + + $"64Proc?:{Environment.Is64BitProcess}"); + + var x = Environment.Is64BitProcess && Environment.Is64BitOperatingSystem ? "-x64" : "-x86"; + + switch (Environment.OSVersion.Platform) + { + case PlatformID.Unix: + return "linux" + x; + case PlatformID.Win32NT: + return "win" + x; + case PlatformID.MacOSX: + return "osx" + x; + } + + return null; + } + + public static void ResolveNativeLibraries() + { + DiscoverNativeLibraries(); + CopyNativeLibraryFilesToRoot(DetectSystem()); + } + + private static void CopyNativeLibraryFilesToRoot(string platformString) + { + // native + foreach (var file in Directory.GetFiles(Path.Combine(Directory.GetCurrentDirectory(), RuntimeLibraryFolder, + platformString, NativeLibrarySubfolder))) + { + File.Copy(file, AppDomain.CurrentDomain.BaseDirectory + $"{Path.GetFileName(file)}", true); + } + } + } +} \ No newline at end of file diff --git a/Raylib-cs/Raylib-cs.csproj b/Raylib-cs/Raylib-cs.csproj index 066aa0c..56c414d 100644 --- a/Raylib-cs/Raylib-cs.csproj +++ b/Raylib-cs/Raylib-cs.csproj @@ -1,70 +1,79 @@ - - AnyCPU;osx-x64;linux-x64;win-x64;win-x86;linux-x86 - Debug;Release - netstandard2.0;netstandard2.1 - + + osx-x64;linux-x64;win-x64;win-x86;linux-x86 + Debug;Release + netstandard2.0;netstandard2.1 + - - false - Raylib-cs - Raylib_cs - true - false - + + false + Raylib-cs + Raylib_cs + true + false + + + + 3.1.0 + 3.1.7 + Chris Dill, Raysan5 & Others + true + $(TargetsForTfmSpecificBuildOutput);GetNativeLibraryFiles + Zlib + Raylib-cs - C# Bindings for Raylib + C# bindings for raylib - A simple and easy-to-use library to learn videogames programming http://www.raylib.com/ + + raylib-cs_64x64.png + Raylib;Raysan;Games;Game-Engine;Engine;Game + git + https://github.com/ChrisDill/Raylib-cs/ + https://www.raylib.com/ + - - 3.1.0 - 3.1.3 - Chris Dill, Raysan5 & Others - true - $(TargetsForTfmSpecificBuildOutput);GetNativeLibraryFiles - Zlib - Raylib-cs - C# Bindings for Raylib - C# bindings for raylib - A simple and easy-to-use library to learn videogames programming http://www.raylib.com/ - - raylib-cs_64x64.png - Raylib;Raysan;Games;Game-Engine;Engine;Game - git - https://github.com/ChrisDill/Raylib-cs/ - https://www.raylib.com/ - - - - - - - - - - - - - - - - - - - - - runtimes/linux-x64/native - - - runtimes/linux-x86/native - - - runtimes/win-x64/native - - - runtimes/win-x86/native - - - runtimes/osx-x64/native - + + + + + + - + + + + + + + + + + + + + + + + + + + + + runtimes/linux-x64/native + + + runtimes/linux-x86/native + + + runtimes/win-x64/native + + + runtimes/win-x86/native + + + runtimes/osx-x64/native + + + diff --git a/Raylib-cs/Raylib-cs.targets b/Raylib-cs/Raylib-cs.targets index b894bb6..63b6651 100644 --- a/Raylib-cs/Raylib-cs.targets +++ b/Raylib-cs/Raylib-cs.targets @@ -1,33 +1,32 @@ - + + + Always + false + + + + - runtimes\osx-x64\libraylib.dylib + runtimes\osx-x64\native\libraylib.dylib true PreserveNewest - + - runtimes\win-x86\raylib.dll + runtimes\win-x64\native\raylib.dll true PreserveNewest - + - runtimes\win-x64\raylib.dll - true - PreserveNewest - - - - - - runtimes\linux-x64\raylib.dll + runtimes\linux-x64\native\raylib.so true PreserveNewest