From e181517fb14d2cb5d26ca63b6fcdcfffb7db2ed4 Mon Sep 17 00:00:00 2001
From: Travis CI <zmoelnig@travis-ci.umlaeute.mur.at>
Date: Fri, 4 Jan 2019 23:37:55 +0000
Subject: Gem 8553d055b0a39acf02d31d8ae8cb6a0a2f732ef0 osx/i386

built 'master:8553d055b0a39acf02d31d8ae8cb6a0a2f732ef0' for osx/i386
---
 Gem/develop/include/Gem/Gem/GemGL.h       | 6 ++++--
 Gem/develop/include/Gem/Gem/GemGLconfig.h | 7 +++++++
 Gem/develop/include/Gem/Gem/Manager.h     | 7 ++++---
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 Gem/develop/include/Gem/Gem/GemGLconfig.h

(limited to 'Gem/develop')

diff --git a/Gem/develop/include/Gem/Gem/GemGL.h b/Gem/develop/include/Gem/Gem/GemGL.h
index 797e889..a009928 100644
--- a/Gem/develop/include/Gem/Gem/GemGL.h
+++ b/Gem/develop/include/Gem/Gem/GemGL.h
@@ -26,8 +26,10 @@
 # include <windows.h>
 #endif
 
-#ifdef GLEW_MX
-# define GEM_MULTICONTEXT
+#include "Gem/GemGLconfig.h"
+
+#ifdef GEM_MULTICONTEXT
+# define GLEW_MX
 #endif
 
 #include "Gem/glew.h"
diff --git a/Gem/develop/include/Gem/Gem/GemGLconfig.h b/Gem/develop/include/Gem/Gem/GemGLconfig.h
new file mode 100644
index 0000000..2165eb6
--- /dev/null
+++ b/Gem/develop/include/Gem/Gem/GemGLconfig.h
@@ -0,0 +1,7 @@
+/* src/Gem/GemGLconfig.h.  Generated from GemGLconfig.h.in by configure.  */
+
+/* Define to 1 if Gem is built with multi-context support */
+#define GEM_MULTICONTEXT 1
+
+/* Define to 1 if using the built-in GLEW */
+#define GLEW_BUILD 1
diff --git a/Gem/develop/include/Gem/Gem/Manager.h b/Gem/develop/include/Gem/Gem/Manager.h
index cbca8ba..48abce7 100644
--- a/Gem/develop/include/Gem/Gem/Manager.h
+++ b/Gem/develop/include/Gem/Gem/Manager.h
@@ -68,7 +68,7 @@ public:
 
   //////////
   // is there a context (has its meaning under X)
-  static void         createContext(char* disp);
+  static void         createContext(const char* disp);
   static int        contextExists(void);
 
   //////////
@@ -98,7 +98,7 @@ public:
 
   //////////
   // Create the window with the current parameters
-  static int        createWindow(char* disp = 0);
+  static int        createWindow(const char* disp = 0);
 
   //////////
   // Destroy the window
@@ -123,6 +123,7 @@ public:
   static void getDimen(int*width, int*height);
   static void getRealDimen(int*width, int*height);
   static void getOffset(int*x, int*y);
+  static void setDimen(int width, int height);
 
   //////////
   // Turn on/off lighting
@@ -219,7 +220,7 @@ private:
   // This window is always available (although not visible)
   static WindowInfo   &getConstWindowInfo(void);
 #endif /* GEM_MULTICONTEXT */
-  static int        createConstWindow(char* disp = 0);
+  static int        createConstWindow(const char* disp = 0);
 
   // gemwin is allowed to modifying "global" window attributes
   friend class gemwin;
-- 
cgit v1.2.1