| Previous | 199869 Revisions | Next |
| r36196 Monday 2nd March, 2015 at 20:05:39 UTC by Couriersud |
|---|
| OpenGL MSVC fix for Peter. If compiling under MSVC, don't use GL/gl.h or GL/glext.h. Use our own headers. (nw) |
| [src/osd/modules/opengl] | SDL1211_opengl.h osd_opengl.h |
| r244707 | r244708 | |
|---|---|---|
| 22 | 22 | |
| 23 | 23 | /* This is a simple file to encapsulate the OpenGL API headers */ |
| 24 | 24 | |
| 25 | #include <SDL/SDL_config.h> | |
| 25 | //#include <SDL/SDL_config.h> | |
| 26 | 26 | |
| 27 | 27 | #ifdef __WIN32__ |
| 28 | 28 | #define WIN32_LEAN_AND_MEAN |
| r244707 | r244708 | |
|---|---|---|
| 16 | 16 | * #include <GL/glext.h> |
| 17 | 17 | */ |
| 18 | 18 | #ifdef OSD_WINDOWS |
| 19 | #include "GL/gl.h" | |
| 20 | #include "GL/glext.h" | |
| 19 | #ifdef _MSC_VER | |
| 20 | #include "SDL1211_opengl.h" | |
| 21 | #else | |
| 22 | #include "GL/gl.h" | |
| 23 | #include "GL/glext.h" | |
| 24 | #endif | |
| 21 | 25 | #else |
| 22 | 26 | #if (SDLMAME_SDL2) |
| 23 | 27 | #include <SDL2/SDL_version.h> |
| https://github.com/mamedev/mame/commit/de6b0909171d576d9ed69a9e57d6fbb134a02a9b |
| Previous | 199869 Revisions | Next |