summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-03-02 21:05:39 +0100
committer couriersud <couriersud@arcor.de>2015-03-02 21:05:39 +0100
commitde6b0909171d576d9ed69a9e57d6fbb134a02a9b (patch)
treec3af78aeb23d66e1e2c293e6666d5f38fdf4ec5f
parent63726631c87b9d0609990bebe3946328d87b47da (diff)
OpenGL MSVC fix for Peter. If compiling under MSVC, don't use GL/gl.h or
GL/glext.h. Use our own headers. (nw)
-rw-r--r--src/osd/modules/opengl/SDL1211_opengl.h2
-rw-r--r--src/osd/modules/opengl/osd_opengl.h8
2 files changed, 7 insertions, 3 deletions
diff --git a/src/osd/modules/opengl/SDL1211_opengl.h b/src/osd/modules/opengl/SDL1211_opengl.h
index d4706f2d518..72aa20cf74d 100644
--- a/src/osd/modules/opengl/SDL1211_opengl.h
+++ b/src/osd/modules/opengl/SDL1211_opengl.h
@@ -22,7 +22,7 @@
/* This is a simple file to encapsulate the OpenGL API headers */
-#include <SDL/SDL_config.h>
+//#include <SDL/SDL_config.h>
#ifdef __WIN32__
#define WIN32_LEAN_AND_MEAN
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index e41911a4b3e..e64736c2576 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -16,8 +16,12 @@
* #include <GL/glext.h>
*/
#ifdef OSD_WINDOWS
- #include "GL/gl.h"
- #include "GL/glext.h"
+ #ifdef _MSC_VER
+ #include "SDL1211_opengl.h"
+ #else
+ #include "GL/gl.h"
+ #include "GL/glext.h"
+ #endif
#else
#if (SDLMAME_SDL2)
#include <SDL2/SDL_version.h>