mirror of
https://github.com/raylib-cs/raylib-cs
synced 2025-04-03 11:09:40 -04:00
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.
This commit is contained in:
Ben Parsons
parent
cea720ba21
commit
ff96c5f420
@ -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
|
||||
|
||||
96
Raylib-cs/Platform.cs
Normal file
96
Raylib-cs/Platform.cs
Normal file
@ -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<string, ( PlatformID, bool)> SupportedPlatforms =
|
||||
new Dictionary<string, (PlatformID PlatformID, bool x64)>()
|
||||
{
|
||||
{"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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<Platforms>AnyCPU;osx-x64;linux-x64;win-x64;win-x86;linux-x86</Platforms>
|
||||
<Platforms>osx-x64;linux-x64;win-x64;win-x86;linux-x86</Platforms>
|
||||
<Configurations>Debug;Release</Configurations>
|
||||
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
@ -13,9 +13,9 @@
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<Version>3.1.0</Version>
|
||||
<PackageVersion>3.1.3</PackageVersion>
|
||||
<PackageVersion>3.1.7</PackageVersion>
|
||||
<Authors>Chris Dill, Raysan5 & Others</Authors>
|
||||
<PackProject>true</PackProject>
|
||||
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetNativeLibraryFiles</TargetsForTfmSpecificBuildOutput>
|
||||
@ -28,22 +28,31 @@
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<RepositoryUrl>https://github.com/ChrisDill/Raylib-cs/</RepositoryUrl>
|
||||
<PackageProjectUrl>https://www.raylib.com/</PackageProjectUrl>
|
||||
</PropertyGroup>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="Easings.cs" />
|
||||
<Compile Include="Raylib.cs" />
|
||||
<Compile Include="Raymath.cs" />
|
||||
<Compile Include="Rlgl.cs" />
|
||||
<None Include="../Logo/raylib-cs_64x64.png" Pack="true" PackagePath="" />
|
||||
<Compile Include="Easings.cs"/>
|
||||
<Compile Include="Platform.cs"/>
|
||||
<Compile Include="Raylib.cs"/>
|
||||
<Compile Include="Raymath.cs"/>
|
||||
<Compile Include="Rlgl.cs"/>
|
||||
<None Include="../Logo/raylib-cs_64x64.png" Pack="true" PackagePath=""/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="Raylib-cs.targets" />
|
||||
<Content Include="Raylib-cs.targets"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
|
||||
<Content Include="runtimes\**" CopyToOutputDirectory="PreserveNewest" Link="runtimes\%(RecursiveDir)\%(Filename)%(Extension)"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="AfterBuild">
|
||||
<Copy SourceFiles="@(MySourceFiles)" DestinationFiles="@(MySourceFiles->'$(OutputPath)\%(RecursiveDir)%(Filename)%(Extension)')"/>
|
||||
</Target>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="GetNativeLibraryFiles">
|
||||
@ -60,7 +69,7 @@
|
||||
<TfmSpecificPackageFile Include="$(BaseOutputPath)\..\runtimes\win-x86\native\raylib.dll">
|
||||
<PackagePath>runtimes/win-x86/native</PackagePath>
|
||||
</TfmSpecificPackageFile>
|
||||
<TfmSpecificPackageFile Include="$(BaseOutputPath)\..\runtimes\osx-x64\native\libraylib.a">
|
||||
<TfmSpecificPackageFile Include="$(BaseOutputPath)\..\runtimes\osx-x64\native\libraylib.dylib">
|
||||
<PackagePath>runtimes/osx-x64/native</PackagePath>
|
||||
</TfmSpecificPackageFile>
|
||||
</ItemGroup>
|
||||
|
||||
@ -1,33 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<ItemGroup Condition=" '$(Platform)' == 'osx-x64' Or '$(Platform)' == 'AnyCPU' Or '$(Platform)' == 'x64'">
|
||||
<ItemGroup>
|
||||
<None Update="runtimes\**\*.*">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
<Visible>false</Visible>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(Platform)' == 'osx-x64' Or '$(Platform)' == 'x64'">
|
||||
<Content Include="raylib">
|
||||
<PackagePath>runtimes\osx-x64\libraylib.dylib</PackagePath>
|
||||
<PackagePath>runtimes\osx-x64\native\libraylib.dylib</PackagePath>
|
||||
<Pack>true</Pack>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(Platform)' == 'win-x86' Or '$(Platform)' == 'AnyCPU' Or '$(Platform)' == 'x86'">
|
||||
<ItemGroup Condition="'$(Platform)' == 'x64' Or '$(Platform)' == 'win-x64'">
|
||||
<Content Include="raylib">
|
||||
<PackagePath>runtimes\win-x86\raylib.dll</PackagePath>
|
||||
<PackagePath>runtimes\win-x64\native\raylib.dll</PackagePath>
|
||||
<Pack>true</Pack>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(Platform)' == 'win-x64' Or '$(Platform)' == 'x64'">
|
||||
<ItemGroup Condition=" '$(Platform)' == 'linux-x64' Or '$(Platform)' == 'x64'">
|
||||
<Content Include="raylib">
|
||||
<PackagePath>runtimes\win-x64\raylib.dll</PackagePath>
|
||||
<Pack>true</Pack>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(Platform)' == 'linux-x64' Or '$(Platform)' == 'AnyCPU' Or '$(Platform)' == 'x64'">
|
||||
<Content Include="raylib">
|
||||
<PackagePath>runtimes\linux-x64\raylib.dll</PackagePath>
|
||||
<PackagePath>runtimes\linux-x64\native\raylib.so</PackagePath>
|
||||
<Pack>true</Pack>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user