diff --git a/corebuild b/corebuild index 6d52a02..ac59741 160000 --- a/corebuild +++ b/corebuild @@ -1 +1 @@ -Subproject commit 6d52a02e4c81463cf89f1fefdebdaa5cfda46542 +Subproject commit ac59741e0732b5387c06a348e804938f234c72e0 diff --git a/deps/cimgui/ubuntu14.04-x64/cimgui.so b/deps/cimgui/ubuntu14.04-x64/cimgui.so new file mode 100644 index 0000000..203c8d7 Binary files /dev/null and b/deps/cimgui/ubuntu14.04-x64/cimgui.so differ diff --git a/deps/cimgui/x64/cimgui.dll b/deps/cimgui/win7-x64/cimgui.dll similarity index 100% rename from deps/cimgui/x64/cimgui.dll rename to deps/cimgui/win7-x64/cimgui.dll diff --git a/deps/cimgui/x64/cimgui.pdb b/deps/cimgui/x64/cimgui.pdb deleted file mode 100644 index 9082bfa..0000000 Binary files a/deps/cimgui/x64/cimgui.pdb and /dev/null differ diff --git a/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj b/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj index 6dbc739..3c6297b 100644 --- a/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj +++ b/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj @@ -38,11 +38,11 @@ - + cimgui.dll PreserveNewest - + cimgui.pdb PreserveNewest diff --git a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj index 1cd9aeb..c778553 100644 --- a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj +++ b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj @@ -32,11 +32,11 @@ - + cimgui.dll PreserveNewest - + cimgui.pdb PreserveNewest diff --git a/src/ImGui.NET/project.json b/src/ImGui.NET/project.json index 105b709..5fa7748 100644 --- a/src/ImGui.NET/project.json +++ b/src/ImGui.NET/project.json @@ -1,8 +1,27 @@ { + "version": "0.1.0-*", + "description": "A .NET wrapper for the dear ImGui library.", + "projectUrl": "https://github.com/mellinoe/imgui.net", + "authors": [ + "Eric Mellino" + ], + "tags": [ + "ImGui ImGui.NET Immediate Mode GUI" + ], + "compilationOptions": { + "allowUnsafe": true + }, "dependencies": { - "Microsoft.NETCore.Console": "1.0.0-beta-23504" + "NETStandard.Library": "1.5.0-rc3-24019-00", + "System.Numerics.Vectors": "4.1.1-rc3-24019-00", }, "frameworks": { - "dnxcore50": { } + "netstandard1.5": { + "imports": [ ] + } + }, + "packInclude": { + "runtimes/win7-x64/native/": "../../deps/cimgui/win7-x64/cimgui.dll", + "runtimes/ubuntu14.04-x64/native/": "../../deps/cimgui/ubuntu14.04-x64/cimgui.so" } -} \ No newline at end of file +}