diff options
Diffstat (limited to 'src/osd/modules/opengl/osd_opengl.h')
-rw-r--r-- | src/osd/modules/opengl/osd_opengl.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h index 26f577f343e..5e843543f46 100644 --- a/src/osd/modules/opengl/osd_opengl.h +++ b/src/osd/modules/opengl/osd_opengl.h @@ -20,11 +20,7 @@ #ifdef OSD_WINDOWS #ifdef _MSC_VER #include <windows.h> - #include "GL/GL.h" - #include "bgfx/3rdparty/khronos/gl/glext.h " - #ifndef USE_DISPATCH_GL - #include "bgfx/3rdparty/khronos/wgl/wglext.h" - #endif + #include "SDL1211_opengl.h" #else #include "GL/gl.h" #include "GL/glext.h" @@ -33,14 +29,28 @@ #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 |