Move more SDL dependancies out of program, OpenGLCanvas for JNI and JNI methods.

3 files changed, 32 insertions, 2 deletions

diff --git a/src/interface/Engine.h b/src/interface/Engine.h
index f40f45f..d278265 100644
--- a/src/interface/Engine.h
+++ b/src/interface/Engine.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <stack>
-#include "SDL.h"
 #include "Singleton.h"
 #include "Platform.h"
 #include "Graphics.h"
diff --git a/src/interface/Keys.h b/src/interface/Keys.h
index 71c5928..85d8611 100644
--- a/src/interface/Keys.h
+++ b/src/interface/Keys.h
@@ -1,3 +1,5 @@
+
+#if defined(USES_SDL)
 #define KEY_UP SDLK_UP
 #define KEY_DOWN SDLK_DOWN
 #define KEY_RIGHT SDLK_RIGHT
@@ -22,3 +24,32 @@
 #define BUTTON_LEFT SDL_BUTTON_LEFT
 #define BUTTON_MIDDLE SDL_BUTTON_MIDDLE
 #define BUTTON_RIGHT SDL_BUTTON_RIGHT
+
+#else
+
+#define KEY_UP 1
+#define KEY_DOWN 2
+#define KEY_RIGHT 3
+#define KEY_LEFT 4
+#define KEY_HOME 5
+#define KEY_END 6
+#define KEY_BACKSPACE 7
+#define	KEY_DELETE 8
+#define KEY_TAB 9
+#define KEY_RETURN 10
+#define KEY_ENTER 11
+#define KEY_ESCAPE 12
+
+#define KEY_CTRL 13
+#define KEY_ALT 14
+#define KEY_SHIFT 15
+
+#define KEY_MOD_CONTROL 16
+#define KEY_MOD_ALT 17
+#define KEY_MOD_SHIFT 18
+
+#define BUTTON_LEFT 19
+#define BUTTON_MIDDLE 20
+#define BUTTON_RIGHT 21
+
+#endif
diff --git a/src/interface/Platform.h b/src/interface/Platform.h
index c57dca6..f9119f1 100644
--- a/src/interface/Platform.h
+++ b/src/interface/Platform.h
@@ -1,6 +1,6 @@
 #pragma once
 
-
+typedef unsigned short Uint16;
 /* ***** Platform-ness ***** */
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32_LEAN_AND_MEAN)