summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/opengl/osd_opengl.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
commitcc24a339d8c0517259084b5c178d784626ba965c (patch)
tree9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/osd/modules/opengl/osd_opengl.h
parentb5daabda5495dea5c50e17961ecfed2ea8619d76 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/osd/modules/opengl/osd_opengl.h')
-rw-r--r--src/osd/modules/opengl/osd_opengl.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index 5e843543f46..26f577f343e 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -20,7 +20,11 @@
#ifdef OSD_WINDOWS
#ifdef _MSC_VER
#include <windows.h>
- #include "SDL1211_opengl.h"
+ #include "GL/GL.h"
+ #include "bgfx/3rdparty/khronos/gl/glext.h "
+ #ifndef USE_DISPATCH_GL
+ #include "bgfx/3rdparty/khronos/wgl/wglext.h"
+ #endif
#else
#include "GL/gl.h"
#include "GL/glext.h"
@@ -29,28 +33,14 @@
#endif
#endif
#else
- #if (SDLMAME_SDL2)
#include <SDL2/SDL_version.h>
- #else
- #include <SDL/SDL_version.h>
- #endif
#if (SDL_VERSION_ATLEAST(1,2,10))
#if defined(SDLMAME_WIN32)
// Avoid that winnt.h (included via sdl_opengl.h, windows.h, windef.h includes intrin.h
#define __INTRIN_H_
#endif
- #if (SDLMAME_SDL2)
#include <SDL2/SDL_opengl.h>
- #else
- #include <SDL/SDL_opengl.h>
- #endif
- #else
- /*
- * SDL 1.2.9 does not provide everything we need
- * We therefore distribute it ourselves
- */
- #include "SDL1211_opengl.h"
#endif
#endif