]> O.S.I.I.S - jp/crow.git/commitdiff
use opentk.next
authorjpbruyere <jp.bruyere@hotmail.com>
Tue, 19 Jul 2016 16:45:43 +0000 (18:45 +0200)
committerjpbruyere <jp.bruyere@hotmail.com>
Tue, 19 Jul 2016 16:45:43 +0000 (18:45 +0200)
.nuget/packages.config
OTKCrow/OTKCrow.csproj
OTKCrow/OpenTKGameWindow.cs
OTKCrow/packages.config [deleted file]
Tests/Tests.csproj

index 146d78b0573d993d52af4297085fbb6d6343bf96..e54f7e708d6bdb2d242912069b99fc7a9f83245b 100644 (file)
@@ -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>
index 225895c8b7f8cde9a27b7f5a76587da4579a170c..6a5577063638c75179ba5cb1b574ebc4b2452017 100644 (file)
     <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" />
index 61683e3468ece8aa300e9ef98ac097caf044ed87..11dd5d2e6facb1dd96647cdae9102fdd2bcf62f5 100644 (file)
@@ -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 (file)
index 25c974b..0000000
+++ /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
index 2e9c9b0bc187c4eb94f9b2742696e60e7f4474fc..0a51a8ced2895ac330b572cf25fd466b49b05a8f 100644 (file)
@@ -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>