Merge pull request #2 from Nairou/master

Fix for VC2010 compile error in GLFW template
mosra · Sep 9, 2011 · 4b675db · 4b675db
2 parents fa65542 + 526a1ae
commit 4b675db
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/templates/glfw/flextGL.c.template b/templates/glfw/flextGL.c.template
@@ -13,11 +13,14 @@ void flextLoadOpenglFunctions();
 
 int flextInit() 
 {
-    flextLoadOpenglFunctions();
-
+#if $version.major*10 + $version.minor >= 32 and not $version.core
+    GLint profile;
+#end if
     int minor = glfwGetWindowParam(GLFW_OPENGL_VERSION_MINOR);
     int major = glfwGetWindowParam(GLFW_OPENGL_VERSION_MAJOR);
 
+    flextLoadOpenglFunctions();
+
     if (major < $version.major || (major == $version.major && minor < $version.minor)) {
         fprintf(stderr, "Error: OpenGL version $(version.major).$(version.minor) not supported.\n");
         fprintf(stderr, "       Your version is %d.%d.\n", major, minor);
@@ -26,8 +29,6 @@ int flextInit()
     }
 
 #if $version.major*10 + $version.minor >= 32 and not $version.core
-    GLint profile;
-
     glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &profile);
 
     if ((profile & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) == 0) {