From 45c1a4dce90d68dde04cf9a1cb924e5293382514 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 14 Mar 2018 09:56:26 +0000
Subject: [PATCH] .rainbow

git-svn-id: svn://ultimatepp.org/upp/trunk@11837 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 rainbow/SDL2GL/{SDL20GL.h => SDL2GL.h} | 0
 rainbow/SDL2GL/SDL2GL.upp              | 2 +-
 rainbow/SDL2Uword/SDL2Uword.upp        | 5 +++--
 rainbow/guiplatform.h                  | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)
 rename rainbow/SDL2GL/{SDL20GL.h => SDL2GL.h} (100%)

diff --git a/rainbow/SDL2GL/SDL20GL.h b/rainbow/SDL2GL/SDL2GL.h
similarity index 100%
rename from rainbow/SDL2GL/SDL20GL.h
rename to rainbow/SDL2GL/SDL2GL.h
diff --git a/rainbow/SDL2GL/SDL2GL.upp b/rainbow/SDL2GL/SDL2GL.upp
index a3e10e2a3..8f9d11c07 100644
--- a/rainbow/SDL2GL/SDL2GL.upp
+++ b/rainbow/SDL2GL/SDL2GL.upp
@@ -11,7 +11,7 @@ library(POSIX) "SDL2 SDL2main GL";
 library(WIN32) "SDL2.lib SDL2main.lib OpenGL32.lib";
 
 file
-	SDL20GL.h,
+	SDL2GL.h,
 	Keys.h,
 	Local.h,
 	After.h,
diff --git a/rainbow/SDL2Uword/SDL2Uword.upp b/rainbow/SDL2Uword/SDL2Uword.upp
index a6ebb27a7..31b63dfec 100644
--- a/rainbow/SDL2Uword/SDL2Uword.upp
+++ b/rainbow/SDL2Uword/SDL2Uword.upp
@@ -2,7 +2,8 @@ uses
 	CtrlLib,
 	RichEdit,
 	plugin/DroidFonts,
-	SDL2Uword;
+	SDL2Uword,
+	SDL2GL;
 
 file
 	test.cpp,
@@ -11,5 +12,5 @@ file
 	help.txt;
 
 mainconfig
-	"" = "GUI SDL20GL";
+	"" = "GUI SDL2GL";
 
diff --git a/rainbow/guiplatform.h b/rainbow/guiplatform.h
index de15bf1f5..6862e5b77 100644
--- a/rainbow/guiplatform.h
+++ b/rainbow/guiplatform.h
@@ -59,3 +59,9 @@
 #define GUIPLATFORM_INCLUDE          <Turtle/Turtle.h>
 #define GUIPLATFORM_NOSCROLL
 #endif
+
+#ifdef flagSDL2GL
+#define GUIPLATFORM_KEYCODES_INCLUDE <SDL2GL/Keys.h>
+//need to make SDL_keysym.h known before K_ enum
+#define GUIPLATFORM_INCLUDE          <SDL2GL/SDL2GL.h>
+#endif