diff --git a/deps/cimgui/linux-x64/cimgui.so b/deps/cimgui/linux-x64/cimgui.so deleted file mode 100644 index d3fdf24..0000000 Binary files a/deps/cimgui/linux-x64/cimgui.so and /dev/null differ diff --git a/deps/cimgui/osx-x64/cimgui.dylib b/deps/cimgui/osx-x64/cimgui.dylib deleted file mode 100644 index a970004..0000000 Binary files a/deps/cimgui/osx-x64/cimgui.dylib and /dev/null differ diff --git a/deps/cimgui/win-x64/cimgui.dll b/deps/cimgui/win-x64/cimgui.dll deleted file mode 100644 index 4fdffc7..0000000 Binary files a/deps/cimgui/win-x64/cimgui.dll and /dev/null differ diff --git a/deps/cimgui/win-x86/cimgui.dll b/deps/cimgui/win-x86/cimgui.dll deleted file mode 100644 index 77c87e0..0000000 Binary files a/deps/cimgui/win-x86/cimgui.dll and /dev/null differ diff --git a/download-native-deps.ps1 b/download-native-deps.ps1 index 3adadb2..4afb7ee 100644 --- a/download-native-deps.ps1 +++ b/download-native-deps.ps1 @@ -1,7 +1,13 @@ param ( + [Parameter(Mandatory=$false)][string]$repository, [Parameter(Mandatory=$true)][string]$tag ) +if( -not $repository ) +{ + $repository="https://github.com/mellinoe/imgui.net-nativebuild" +} + Write-Host Downloading native binaries from GitHub Releases... if (Test-Path $PSScriptRoot\deps\cimgui\) @@ -9,7 +15,7 @@ if (Test-Path $PSScriptRoot\deps\cimgui\) Remove-Item $PSScriptRoot\deps\cimgui\ -Force -Recurse | Out-Null } New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\linux-x64 | Out-Null -New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\osx-x64 | Out-Null +New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\osx-universal | Out-Null New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x86 | Out-Null New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x64 | Out-Null @@ -17,7 +23,7 @@ New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x64 | Ou $client = New-Object System.Net.WebClient $client.DownloadFile( - "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.win-x86.dll", + "$repository/releases/download/$tag/cimgui.win-x86.dll", "$PSScriptRoot/deps/cimgui/win-x86/cimgui.dll") if( -not $? ) { @@ -29,7 +35,7 @@ if( -not $? ) Write-Host "- cimgui.dll (x86)" $client.DownloadFile( - "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.win-x64.dll", + "$repository/releases/download/$tag/cimgui.win-x64.dll", "$PSScriptRoot/deps/cimgui/win-x64/$configuration/cimgui.dll") if( -not $? ) { @@ -41,7 +47,7 @@ if( -not $? ) Write-Host "- cimgui.dll (x64)" $client.DownloadFile( - "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.so", + "$repository/releases/download/$tag/cimgui.so", "$PSScriptRoot/deps/cimgui/linux-x64/cimgui.so") if( -not $? ) { @@ -53,8 +59,8 @@ if( -not $? ) Write-Host - cimgui.so $client.DownloadFile( - "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.dylib", - "$PSScriptRoot/deps/cimgui/osx-x64/cimgui.dylib") + "$repository/releases/download/$tag/cimgui.dylib", + "$PSScriptRoot/deps/cimgui/osx-universal/cimgui.dylib") if( -not $? ) { $msg = $Error[0].Exception.Message @@ -62,4 +68,4 @@ if( -not $? ) exit } -Write-Host - cimgui.dylib +Write-Host "- cimgui.dylib" diff --git a/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj b/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj index 83e6402..fc6979b 100644 --- a/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj +++ b/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj @@ -5,7 +5,7 @@ false ImGuiNET.SampleProgram.XNA ImGuiNET.SampleProgram.XNA - net472 + net6.0 Exe @@ -15,7 +15,7 @@ - + diff --git a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj index 6f7e984..9e9d7b4 100644 --- a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj +++ b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net6.0 true @@ -26,7 +26,7 @@ - + diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj index 5b0a928..142fa84 100644 --- a/src/ImGui.NET/ImGui.NET.csproj +++ b/src/ImGui.NET/ImGui.NET.csproj @@ -3,7 +3,7 @@ A .NET wrapper for the Dear ImGui library. 1.82.0 Eric Mellino - netstandard2.0 + net6.0 true portable ImGui.NET @@ -41,8 +41,8 @@ runtimes/linux-x64/native/libcimgui.so true - - runtimes/osx-x64/native/libcimgui.dylib + + runtimes/osx-universal/native/libcimgui.dylib true diff --git a/src/ImGui.NET/build/net40/ImGui.NET.targets b/src/ImGui.NET/build/net40/ImGui.NET.targets index 36482b6..e323ac3 100644 --- a/src/ImGui.NET/build/net40/ImGui.NET.targets +++ b/src/ImGui.NET/build/net40/ImGui.NET.targets @@ -5,13 +5,14 @@ <_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true <_IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true - <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64 + <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And '$(PlatformTarget)' == 'x64'">osx-x64 + <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And '$(PlatformTarget)' == 'ARM64'">osx-arm64 <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64 <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86 <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64 <_NativeLibName Condition="'$(_NativeRuntime)' == 'win-x86' Or '$(_NativeRuntime)' == 'win-x64'">cimgui.dll - <_NativeLibName Condition="'$(_NativeRuntime)' == 'osx-x64'">libcimgui.dylib + <_NativeLibName Condition="'$(_NativeRuntime)' == 'osx-x64' Or '$(_NativeRuntime)' == 'osx-arm64'">libcimgui.dylib <_NativeLibName Condition="'$(_NativeRuntime)' == 'linux-x64'">libcimgui.so