Browse Source

Made Visual Studio play nice with the C++ STL min/max functions in the new shader code

Alex Szpakowski 12 years ago
parent
commit
7a16e4cb49

+ 5 - 2
src/modules/graphics/opengl/OpenGL.cpp

@@ -18,10 +18,13 @@
  * 3. This notice may not be removed or altered from any source distribution.
  * 3. This notice may not be removed or altered from any source distribution.
  **/
  **/
 
 
+#include "common/config.h"
+#include "common/Exception.h"
+
+#include "OpenGL.h"
+
 #include <vector>
 #include <vector>
 #include <algorithm>
 #include <algorithm>
-#include "OpenGL.h"
-#include "common/Exception.h"
 
 
 namespace love
 namespace love
 {
 {

+ 3 - 1
src/modules/graphics/opengl/Shader.cpp

@@ -18,11 +18,13 @@
  * 3. This notice may not be removed or altered from any source distribution.
  * 3. This notice may not be removed or altered from any source distribution.
  **/
  **/
 
 
-#include <algorithm>
+#include "common/config.h"
 
 
 #include "Shader.h"
 #include "Shader.h"
 #include "Graphics.h"
 #include "Graphics.h"
 
 
+#include <algorithm>
+
 namespace love
 namespace love
 {
 {
 namespace graphics
 namespace graphics