Update corebuild submodule

internals
Eric Mellino 9 years ago
parent cbc1395f59
commit 026ac1eb89
  1. 2
      corebuild
  2. 10
      src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
  3. 1
      src/ImGui.NET.SampleProgram/SampleWindow.cs
  4. 6
      src/ImGui.NET.SampleProgram/project.json

@ -1 +1 @@
Subproject commit ac59741e0732b5387c06a348e804938f234c72e0 Subproject commit 8d6d63f9fa00ee984edb64907bb41bce78a7d970

@ -34,10 +34,14 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll"> <Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll" Condition="'$(OSTarget)' == 'Windows'">
<Link>cimgui.dll</Link> <Link>cimgui.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> <Content Include="..\..\deps\cimgui\ubuntu14.04-x64\cimgui.so" Condition="'$(OSTarget)' == 'Ubuntu'">
<Link>cimgui.so</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project> </Project>

@ -41,6 +41,7 @@ namespace ImGuiNET
((IGraphicsContextInternal)_graphicsContext).LoadAll(); // wtf is this? ((IGraphicsContextInternal)_graphicsContext).LoadAll(); // wtf is this?
GL.ClearColor(Color.Black); GL.ClearColor(Color.Black);
_nativeWindow.Visible = true; _nativeWindow.Visible = true;
_nativeWindow.X = _nativeWindow.X; // Work around OpenTK bug (?) on Ubuntu.
_nativeWindow.KeyDown += OnKeyDown; _nativeWindow.KeyDown += OnKeyDown;
_nativeWindow.KeyUp += OnKeyUp; _nativeWindow.KeyUp += OnKeyUp;

@ -6,12 +6,10 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0" "version": "1.0.0"
}, },
"ImGui.NET": { "target": "project" }, "ImGui.NET": { "target": "project" },
"OpenTK.NETCore": "1.1.2364.6424", "OpenTK.NETCore": "1.1.2364.6424"
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": {} "netcoreapp1.0": {}
@ -24,4 +22,4 @@
"cimgui.dll", "cimgui.dll",
"cimgui.so" "cimgui.so"
] ]
} }

Loading…
Cancel
Save