Browse Source

hopefully fixed a bunch of missing includes for windows

Former-commit-id: 600a43df7b78fe5ac26bbf74292c6e15430247cf
jalec 13 years ago
parent
commit
ad715f0020

+ 5 - 4
include/igl/create_index_vbo.h

@@ -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

+ 5 - 4
include/igl/create_mesh_vbo.h

@@ -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

+ 5 - 4
include/igl/create_shader_program.h

@@ -7,11 +7,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

+ 5 - 4
include/igl/create_vector_vbo.h

@@ -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

+ 5 - 4
include/igl/destroy_shader_program.h

@@ -5,11 +5,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

+ 9 - 6
include/igl/gl_type_size.h

@@ -2,15 +2,18 @@
 #define IGL_GL_TYPE_SIZE_H
 #include "igl_inline.h"
 
-#if __APPLE__
+
+#ifdef __APPLE__
 #  include <OpenGL/gl.h>
+#elif defined(_WIN32)
+#  define NOMINMAX
+#  include <Windows.h>
+#  undef NOMINMAX
+#  include <GL/gl.h>
 #else
-#  ifdef _WIN32
-#    define NOMINMAX
-#    include <Windows.h>
-#    undef NOMINMAX
-#  endif
+#  define GL_GLEXT_PROTOTYPES
 #  include <GL/gl.h>
+#  include <GL/glext.h>
 #endif
 
 namespace igl

+ 5 - 4
include/igl/load_shader.h

@@ -5,11 +5,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

+ 1 - 0
include/igl/lu_lagrange.cpp

@@ -6,6 +6,7 @@
 #include <iostream>
 #include <unsupported/Eigen/SparseExtra>
 #include <cassert>
+#include <cstdio>
 #include "find.h"
 #include "sparse.h"
 

+ 8 - 6
include/igl/print_gl_get.h

@@ -2,15 +2,17 @@
 #define IGL_PRINT_GL_GET_H
 #include "igl_inline.h"
 
-#if __APPLE__
+#ifdef __APPLE__
 #  include <OpenGL/gl.h>
+#elif defined(_WIN32)
+#  define NOMINMAX
+#  include <Windows.h>
+#  undef NOMINMAX
+#  include <GL/gl.h>
 #else
-#  ifdef _WIN32
-#    define NOMINMAX
-#    include <Windows.h>
-#    undef NOMINMAX
-#  endif
+#  define GL_GLEXT_PROTOTYPES
 #  include <GL/gl.h>
+#  include <GL/glext.h>
 #endif
 
 namespace igl

+ 5 - 4
include/igl/print_program_info_log.h

@@ -5,11 +5,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

+ 5 - 4
include/igl/print_shader_info_log.h

@@ -5,11 +5,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

+ 8 - 6
include/igl/texture_from_tga.h

@@ -2,15 +2,17 @@
 #define IGL_TEXTURE_FROM_TGA_H
 #include "igl_inline.h"
 
-#if __APPLE__
+#ifdef __APPLE__
 #  include <OpenGL/gl.h>
+#elif defined(_WIN32)
+#  define NOMINMAX
+#  include <Windows.h>
+#  undef NOMINMAX
+#  include <GL/gl.h>
 #else
-#  ifdef _WIN32
-#    define NOMINMAX
-#    include <Windows.h>
-#    undef NOMINMAX
-#  endif
+#  define GL_GLEXT_PROTOTYPES
 #  include <GL/gl.h>
+#  include <GL/glext.h>
 #endif
 
 #include <string>

+ 7 - 5
include/igl/uniform_type_to_string.h

@@ -6,13 +6,15 @@
 
 #ifdef __APPLE__
 #  include <OpenGL/gl.h>
+#elif defined(_WIN32)
+#  define NOMINMAX
+#  include <Windows.h>
+#  undef NOMINMAX
+#  include <GL/gl.h>
 #else
-#  ifdef _WIN32
-#    define NOMINMAX
-#    include <Windows.h>
-#    undef NOMINMAX
-#  endif
+#  define GL_GLEXT_PROTOTYPES
 #  include <GL/gl.h>
+#  include <GL/glext.h>
 #endif
 
 namespace igl