Permalink
Browse files

Merge remote-tracking branch 'nilium/master' into work

  • Loading branch information...
2 parents bb5c4da + 5dee8c0 commit 44577811667e2b5a6299edde04b4cc0f554a6ca9 @banthar committed Apr 2, 2012
Showing with 3 additions and 11 deletions.
  1. +2 −6 gl.go
  2. +1 −5 gl_defs.c
View
8 gl.go
@@ -1,16 +1,12 @@
package gl
-// #cgo darwin LDFLAGS: -framework OpenGL -lGLEW -lGL
+// #cgo darwin LDFLAGS: -framework OpenGL -lGLEW
// #cgo windows LDFLAGS: -lglew32 -lopengl32
// #cgo linux LDFLAGS: -lGLEW -lGL
//
// #include <stdlib.h>
//
-// #ifdef __APPLE__
-// # include <OpenGL/glew.h>
-// #else
-// # include <GL/glew.h>
-// #endif
+// #include <GL/glew.h>
//
// #undef GLEW_GET_FUN
// #define GLEW_GET_FUN(x) (*x)
View
@@ -1,8 +1,4 @@
-#ifdef __APPLE__
-# include <OpenGL/glew.h>
-#else
-# include <GL/glew.h>
-#endif
+#include <GL/glew.h>
enum
{

0 comments on commit 4457781

Please sign in to comment.