Former-commit-id: 600a43df7b78fe5ac26bbf74292c6e15430247cf
@@ -8,11 +8,12 @@
#ifdef __APPLE__
# include <OpenGL/gl.h>
#elif defined(_WIN32)
-# define NOMINMAX
-# include <Windows.h>
-# undef NOMINMAX
+# define NOMINMAX
+# include <Windows.h>
+# undef NOMINMAX
+# include <GL/gl.h>
#else
-#define GL_GLEXT_PROTOTYPES
+# define GL_GLEXT_PROTOTYPES
# include <GL/gl.h>
# include <GL/glext.h>
#endif
@@ -7,11 +7,12 @@
@@ -5,11 +5,12 @@
@@ -2,15 +2,18 @@
#define IGL_GL_TYPE_SIZE_H
#include "igl_inline.h"
-#if __APPLE__
+
+#ifdef __APPLE__
+#elif defined(_WIN32)
-# ifdef _WIN32
-# endif
+# include <GL/glext.h>
namespace igl
@@ -6,6 +6,7 @@
#include <iostream>
#include <unsupported/Eigen/SparseExtra>
#include <cassert>
+#include <cstdio>
#include "find.h"
#include "sparse.h"
@@ -2,15 +2,17 @@
#define IGL_PRINT_GL_GET_H
#define IGL_TEXTURE_FROM_TGA_H
#include <string>
@@ -6,13 +6,15 @@