Skip to content

Commit ae3ecd0

Browse files
mellinoemellinoe
committed
Merge remote-tracking branch 'Tarik02/feature/apple-silicon'
2 parents 1707677 + 7644b2c commit ae3ecd0

5 files changed

Lines changed: 23 additions & 16 deletions

File tree

‎download-native-deps.ps1‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
param (
2+
[Parameter(Mandatory=$false)][string]$repository,
23
[Parameter(Mandatory=$true)][string]$tag
34
)
45

6+
if( -not $repository )
7+
{
8+
$repository="https://github.com/mellinoe/imgui.net-nativebuild"
9+
}
10+
511
Write-Host Downloading native binaries from GitHub Releases...
612

713
if (Test-Path $PSScriptRoot\deps\cimgui\)
814
{
915
Remove-Item $PSScriptRoot\deps\cimgui\ -Force -Recurse | Out-Null
1016
}
1117
New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\linux-x64 | Out-Null
12-
New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\osx-x64 | Out-Null
18+
New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\osx-universal | Out-Null
1319
New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x86 | Out-Null
1420
New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x64 | Out-Null
1521

1622
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
1723

1824
$client = New-Object System.Net.WebClient
1925
$client.DownloadFile(
20-
"https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.win-x86.dll",
26+
"$repository/releases/download/$tag/cimgui.win-x86.dll",
2127
"$PSScriptRoot/deps/cimgui/win-x86/cimgui.dll")
2228
if( -not $? )
2329
{
@@ -29,7 +35,7 @@ if( -not $? )
2935
Write-Host "- cimgui.dll (x86)"
3036

3137
$client.DownloadFile(
32-
"https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.win-x64.dll",
38+
"$repository/releases/download/$tag/cimgui.win-x64.dll",
3339
"$PSScriptRoot/deps/cimgui/win-x64/$configuration/cimgui.dll")
3440
if( -not $? )
3541
{
@@ -41,7 +47,7 @@ if( -not $? )
4147
Write-Host "- cimgui.dll (x64)"
4248

4349
$client.DownloadFile(
44-
"https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.so",
50+
"$repository/releases/download/$tag/cimgui.so",
4551
"$PSScriptRoot/deps/cimgui/linux-x64/cimgui.so")
4652
if( -not $? )
4753
{
@@ -53,16 +59,16 @@ if( -not $? )
5359
Write-Host - cimgui.so
5460

5561
$client.DownloadFile(
56-
"https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.dylib",
57-
"$PSScriptRoot/deps/cimgui/osx-x64/cimgui.dylib")
62+
"$repository/releases/download/$tag/cimgui.dylib",
63+
"$PSScriptRoot/deps/cimgui/osx-universal/cimgui.dylib")
5864
if( -not $? )
5965
{
6066
$msg = $Error[0].Exception.Message
6167
Write-Error "Couldn't download cimgui.dylib. This most likely indicates the macOS native build failed."
6268
exit
6369
}
6470

65-
Write-Host - cimgui.dylib
71+
Write-Host "- cimgui.dylib"
6672

6773
$client.DownloadFile(
6874
"https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/definitions.json",
@@ -86,4 +92,4 @@ if( -not $? )
8692
exit
8793
}
8894

89-
Write-Host - structs_and_enums.json
95+
Write-Host - structs_and_enums.json

‎src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66
<AssemblyName>ImGuiNET.SampleProgram.XNA</AssemblyName>
77
<RootNamespace>ImGuiNET.SampleProgram.XNA</RootNamespace>
8-
<TargetFramework>net472</TargetFramework>
8+
<TargetFramework>net6.0</TargetFramework>
99
<OutputType>Exe</OutputType>
1010
</PropertyGroup>
1111

@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/win-x64/cimgui.dll" CopyToOutputDirectory="PreserveNewest" />
18-
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx-x64/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="lib%(Filename)%(Extension)" />
18+
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx-universal/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="lib%(Filename)%(Extension)" />
1919
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" Link="lib%(Filename)%(Extension)" />
2020
</ItemGroup>
2121

‎src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup>
2828
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/win-x64/cimgui.dll" CopyToOutputDirectory="PreserveNewest" />
29-
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx-x64/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" />
29+
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx-universal/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" />
3030
<Content Include="$(RepositoryRootDirectory)/deps/cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" />
3131
</ItemGroup>
3232

‎src/ImGui.NET/ImGui.NET.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Description>A .NET wrapper for the Dear ImGui library.</Description>
44
<AssemblyVersion>1.87.0</AssemblyVersion>
55
<Authors>Eric Mellino</Authors>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<DebugType>portable</DebugType>
99
<AssemblyName>ImGui.NET</AssemblyName>
@@ -41,8 +41,8 @@
4141
<PackagePath>runtimes/linux-x64/native/libcimgui.so</PackagePath>
4242
<Pack>true</Pack>
4343
</Content>
44-
<Content Include="..\..\deps\cimgui\osx-x64\cimgui.dylib">
45-
<PackagePath>runtimes/osx-x64/native/libcimgui.dylib</PackagePath>
44+
<Content Include="..\..\deps\cimgui\osx-universal\cimgui.dylib">
45+
<PackagePath>runtimes/osx-universal/native/libcimgui.dylib</PackagePath>
4646
<Pack>true</Pack>
4747
</Content>
4848
<Content Include="build\net40\ImGui.NET.targets">

‎src/ImGui.NET/build/net40/ImGui.NET.targets‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</_IsMacOS>
66
<_IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</_IsLinux>
77

8-
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64</_NativeRuntime>
8+
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And '$(PlatformTarget)' == 'x64'">osx-x64</_NativeRuntime>
9+
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And '$(PlatformTarget)' == 'ARM64'">osx-arm64</_NativeRuntime>
910
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_NativeRuntime>
1011
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_NativeRuntime>
1112
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_NativeRuntime>
1213

1314
<_NativeLibName Condition="'$(_NativeRuntime)' == 'win-x86' Or '$(_NativeRuntime)' == 'win-x64'">cimgui.dll</_NativeLibName>
14-
<_NativeLibName Condition="'$(_NativeRuntime)' == 'osx-x64'">libcimgui.dylib</_NativeLibName>
15+
<_NativeLibName Condition="'$(_NativeRuntime)' == 'osx-x64' Or '$(_NativeRuntime)' == 'osx-arm64'">libcimgui.dylib</_NativeLibName>
1516
<_NativeLibName Condition="'$(_NativeRuntime)' == 'linux-x64'">libcimgui.so</_NativeLibName>
1617
</PropertyGroup>
1718
<ItemGroup>

0 commit comments

Comments
 (0)