From 89845d5ff9eb927a130737a7314820ad7d2c5fab Mon Sep 17 00:00:00 2001 From: thefiddler Date: Fri, 27 Sep 2013 14:33:52 +0200 Subject: [PATCH] Integrated sdl2-cs bindings for sdl2 This is using the sdl2/pure branch of https://github.com/thefiddler/SDL2-CS.git which contains the SDL2 bindings without MiniTK. --- Source/OpenTK/OpenTK.csproj | 7 +++++++ .../OpenTK/Platform/SDL2/sdl2-cs/src/LPUtf8StrMarshaler.cs | 2 +- Source/OpenTK/Platform/SDL2/sdl2-cs/src/SDL2.cs | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj index 1e1d14f1..a1e116fd 100644 --- a/Source/OpenTK/OpenTK.csproj +++ b/Source/OpenTK/OpenTK.csproj @@ -782,6 +782,10 @@ + + + + @@ -790,4 +794,7 @@ + + + \ No newline at end of file diff --git a/Source/OpenTK/Platform/SDL2/sdl2-cs/src/LPUtf8StrMarshaler.cs b/Source/OpenTK/Platform/SDL2/sdl2-cs/src/LPUtf8StrMarshaler.cs index df720c1b..7422b5c2 100644 --- a/Source/OpenTK/Platform/SDL2/sdl2-cs/src/LPUtf8StrMarshaler.cs +++ b/Source/OpenTK/Platform/SDL2/sdl2-cs/src/LPUtf8StrMarshaler.cs @@ -28,7 +28,7 @@ using System; using System.Text; using System.Runtime.InteropServices; -namespace SDL2 +namespace OpenTK.Platform.SDL2 { internal unsafe class LPUtf8StrMarshaler : ICustomMarshaler { diff --git a/Source/OpenTK/Platform/SDL2/sdl2-cs/src/SDL2.cs b/Source/OpenTK/Platform/SDL2/sdl2-cs/src/SDL2.cs index 5a90947c..bd389ace 100644 --- a/Source/OpenTK/Platform/SDL2/sdl2-cs/src/SDL2.cs +++ b/Source/OpenTK/Platform/SDL2/sdl2-cs/src/SDL2.cs @@ -31,7 +31,7 @@ using System; using System.Runtime.InteropServices; #endregion -namespace SDL2 +namespace OpenTK.Platform.SDL2 { /// /// Entry point for all SDL-related (non-extension) types and methods