diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-07-19 18:45:43 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-07-19 18:45:43 +0200 |
| commit | 42068f400565d21a9e5dcd7f2becbf6eb8bee696 (patch) | |
| tree | 9d398be2edb6d2c93b88cd4c89da75132bf656dd | |
| parent | dd280d3306fde87db325066a7798119d5f3b87d6 (diff) | |
use opentk.next
| -rw-r--r-- | .nuget/packages.config | 2 | ||||
| -rw-r--r-- | OTKCrow/OTKCrow.csproj | 6 | ||||
| -rw-r--r-- | OTKCrow/OpenTKGameWindow.cs | 12 | ||||
| -rw-r--r-- | OTKCrow/packages.config | 4 | ||||
| -rw-r--r-- | Tests/Tests.csproj | 4 |
5 files changed, 12 insertions, 16 deletions
diff --git a/.nuget/packages.config b/.nuget/packages.config index 146d78b0..e54f7e70 100644 --- a/.nuget/packages.config +++ b/.nuget/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="gtk-sharp.Linux.3.14" version="3.14.7" targetFramework="net45" /> - <package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" /> + <package id="OpenTK.Next" version="1.2.2336.6514-pre" targetFramework="net45" /> </packages> diff --git a/OTKCrow/OTKCrow.csproj b/OTKCrow/OTKCrow.csproj index 225895c8..6a557706 100644 --- a/OTKCrow/OTKCrow.csproj +++ b/OTKCrow/OTKCrow.csproj @@ -36,12 +36,12 @@ <Reference Include="System.Data" /> <Reference Include="System.Xml" /> <Reference Include="System.Drawing" /> - <Reference Include="OpenTK"> - <HintPath>..\packages\OpenTK.1.1.2349.61993\lib\NET40\OpenTK.dll</HintPath> - </Reference> <Reference Include="cairo-sharp"> <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath> </Reference> + <Reference Include="OpenTK"> + <HintPath>..\packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="OpenTKGameWindow.cs" /> diff --git a/OTKCrow/OpenTKGameWindow.cs b/OTKCrow/OpenTKGameWindow.cs index 61683e34..11dd5d2e 100644 --- a/OTKCrow/OpenTKGameWindow.cs +++ b/OTKCrow/OpenTKGameWindow.cs @@ -141,12 +141,12 @@ namespace Crow } void CrowInterface_MouseCursorChanged (object sender, MouseCursorChangedEventArgs e) { -// this.Cursor = new MouseCursor( -// (int)e.NewCursor.Xhot, -// (int)e.NewCursor.Yhot, -// (int)e.NewCursor.Width, -// (int)e.NewCursor.Height, -// e.NewCursor.data); + this.Cursor = new MouseCursor( + (int)e.NewCursor.Xhot, + (int)e.NewCursor.Yhot, + (int)e.NewCursor.Width, + (int)e.NewCursor.Height, + e.NewCursor.data); } #region Events diff --git a/OTKCrow/packages.config b/OTKCrow/packages.config deleted file mode 100644 index 25c974be..00000000 --- a/OTKCrow/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" /> -</packages>
\ No newline at end of file diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 2e9c9b0b..0a51a8ce 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -36,8 +36,8 @@ <Reference Include="System.Data" /> <Reference Include="System.Xml" /> <Reference Include="System.Drawing" /> - <Reference Include="OpenTK"> - <HintPath>..\packages\OpenTK.1.1.2349.61993\lib\NET40\OpenTK.dll</HintPath> + <Reference Include="OpenTK"> + <HintPath>..\packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> |