dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-17 01:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Windows Build with SDL2

Browse source 
for some reason neo/tools/compilers/dmap/optimize.cpp included windows.h
and GL/gl.h before including dmap.h, which indirectly includes qgl.h.

This made things in qgl.h explode - seems like APIENTRYP in the
QGLPROC() macro expanded to bullshit because of some APIENTRYP or
APIENTRY definition in windows.h or GL/gl.h

Those includes are totally unnecessary, dmap.h -> qgl.h already includes
GL/gl.h, indirectly via SDL_opengl.h and in that setup things somehow
are fine.
This commit is contained in:
Daniel Gibson 2015-09-28 04:02:33 +02:00
parent cf8695bb0f
commit 51f3acd21a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/tools/compilers/dmap/optimize.cpp
View file

@ -30,7 +30,9 @@ If you have questions concerning this license or the applicable additional terms
//#pragma optimize( "", off ) //#pragma optimize( "", off )
#ifdef WIN32
// #ifdef WIN32 // DG: this caused trouble, especially with SDL2
#if 0
#include <windows.h> #include <windows.h>
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif