From dcb9b89d51c9a021f52db59976377a4421c5620a Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Tue, 12 Mar 2019 21:56:52 -0700 Subject: [PATCH] Add build targets for mono and legacy MSBuild (pre-PackageReference). Also, rename native lib back to cimgui.dylib. --- .../osx-x64/{libcimgui.dylib => cimgui.dylib} | Bin .../ImGui.NET.SampleProgram.XNA.csproj | 6 +++-- src/ImGui.NET/ImGui.NET.csproj | 10 +++++--- src/ImGui.NET/build/net40/ImGui.NET.targets | 24 ++++++++++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) rename deps/cimgui/osx-x64/{libcimgui.dylib => cimgui.dylib} (100%) create mode 100644 src/ImGui.NET/build/net40/ImGui.NET.targets diff --git a/deps/cimgui/osx-x64/libcimgui.dylib b/deps/cimgui/osx-x64/cimgui.dylib similarity index 100% rename from deps/cimgui/osx-x64/libcimgui.dylib rename to deps/cimgui/osx-x64/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 2b0823e..623947d 100644 --- a/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj +++ b/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj @@ -15,8 +15,10 @@ - - + + diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj index 0f0ef6b..717bda1 100644 --- a/src/ImGui.NET/ImGui.NET.csproj +++ b/src/ImGui.NET/ImGui.NET.csproj @@ -30,11 +30,15 @@ true - runtimes/linux-x64/native + runtimes/linux-x64/native/libcimgui.so true - - runtimes/osx-x64/native + + runtimes/osx-x64/native/libcimgui.dylib + true + + + build/net40/ImGui.NET.targets true diff --git a/src/ImGui.NET/build/net40/ImGui.NET.targets b/src/ImGui.NET/build/net40/ImGui.NET.targets new file mode 100644 index 0000000..36482b6 --- /dev/null +++ b/src/ImGui.NET/build/net40/ImGui.NET.targets @@ -0,0 +1,24 @@ + + + + <_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true + <_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 '$(_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)' == 'linux-x64'">libcimgui.so + + + + %(Filename)%(Extension) + Always + False + + +