Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenGL.hpp now includes windows.h only with VC++

Browse Source
This commit is contained in:
Laurent Gomila 2011-09-02 19:26:49 +02:00
parent 18cebde155
commit 7f390367f1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/SFML/OpenGL.hpp
View File

@ -38,7 +38,11 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
#include <windows.h> // The Visual C++ version of gl.h uses WINGDIAPI and APIENTRY but doesn't define them
#ifdef _MSC_VER
#include <windows.h>
#endif
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>

1
src/SFML/Window/Win32/WglContext.hpp
View File

@ -30,6 +30,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Window/GlContext.hpp> #include <SFML/Window/GlContext.hpp>
#include <SFML/OpenGL.hpp> #include <SFML/OpenGL.hpp>
#include <windows.h>
namespace sf namespace sf