Changeset 960Tweet

Timestamp:

Sep 19, 2011, 1:32:18 AM (12 years ago)

Author:

sam

Message:

osx: link with the proper OpenGL libraries on OS X.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• src/debug/quad.cpp (modified) (4 diffs)
• src/gradient.cpp (modified) (4 diffs)
• src/lolgl.h (modified) (1 diff)
• src/scene.cpp (modified) (6 diffs)
• src/video.cpp (modified) (6 diffs)

trunk/configure.ac

@@ -103 +103 @@
  [MAKE_FSELF=no])
 AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")
+
+
+LIBS_save="$LIBS"
+LIBS="$LIBS -Wl,-framework -Wl,OpenGL"
+AC_MSG_CHECKING(for -framework OpenGL)
+AC_TRY_LINK([], [],
+ [ac_cv_my_have_cocoa="yes"
+  AC_MSG_RESULT(yes)
+  GL_LIBS="${GL_LIBS} -framework OpenGL"
+  CXXFLAGS="${CXXFLAGS} -ObjC++"],
+ [AC_MSG_RESULT(no)])
+LIBS="$LIBS_save"
 
 
@@ -233 +245 @@
 
 
-dnl Use Cocoa?
-ac_cv_my_have_cocoa="no"
-LIBS_save="$LIBS"
-LIBS="$LIBS -Wl,-framework -Wl,Cocoa"
-AC_MSG_CHECKING(for -framework Cocoa)
-AC_TRY_LINK([], [],
- [ac_cv_my_have_cocoa="yes"
-  AC_MSG_RESULT(yes)
-  CXXFLAGS="${CXXFLAGS} -ObjC++"],
- [AC_MSG_RESULT(no)])
-LIBS="$LIBS_save"
-AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" != "no")
-
-
 dnl Use EGL?
 ac_cv_my_have_egl="no"

trunk/src/debug/quad.cpp

@@ -154 +154 @@
     if (!data->initialised && !IsDestroying())
     {
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
         glGenVertexArrays(NUM_ARRAYS, data->array);
 #endif
@@ -184 +184 @@
     else if (data->initialised && IsDestroying())
     {
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
         glDeleteVertexArrays(NUM_ARRAYS, data->array);
 #endif
@@ -916 +916 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     if (!shader[0])
     {
@@ -986 +986 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
     if (!shader[0])
     {

trunk/src/gradient.cpp

@@ -34 +34 @@
     Shader *shader;
     GLuint bufs[2];
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
     GLuint vaos[1];
 #endif
@@ -155 +155 @@
 #if !defined __CELLOS_LV2__
         glGenBuffers(2, data->bufs);
-#   if defined HAVE_GL_2X
+#   if defined HAVE_GL_2X && !defined __APPLE__
         glGenVertexArrays(1, data->vaos);
 #   endif
@@ -196 +196 @@
     /* Bind vertex, color and texture coordinate buffers */
 #if !defined __CELLOS_LV2__
-#   if defined HAVE_GL_2X
+#   if defined HAVE_GL_2X && !defined __APPLE__
     glBindVertexArray(data->vaos[0]);
 #   endif
@@ -223 +223 @@
 
 #if !defined __CELLOS_LV2__
-#   if defined HAVE_GL_2X
+#   if defined HAVE_GL_2X && !defined __APPLE__
     glBindVertexArray(0);
 #   endif

trunk/src/lolgl.h

@@ -24 +24 @@
 #endif
 
-/* Include GL */
-#if defined USE_GLEW
+/* Include GL development headers.
+ * Do not include glew.h on OS X, because the version shipped with Fink
+ * links with X11 whereas we want the system’s Cocoa-friendly GL libs. */
+#if defined USE_GLEW && !defined __APPLE__
 #   include <glew.h>
 #elif defined HAVE_GL_2X
-#   if defined __APPLE__ && defined __MACH__
+#   if defined __APPLE__ && defined __MACH__ && defined __arm__
 #       include <OpenGL/gl.h>
+#   elif defined __APPLE__ && defined __MACH__
+#       define MACOS_OPENGL
+#       define GL_GLEXT_PROTOTYPES
+#       include <OpenGL/OpenGL.h>
+#       include <OpenGL/gl.h>
+#       include <OpenGL/glext.h>
 #   else
 #       define GL_GLEXT_PROTOTYPES

trunk/src/scene.cpp

@@ -60 +60 @@
     float angle;
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
     GLuint vao;
 #endif
@@ -85 +85 @@
     data->nbufs = 0;
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
     glGenVertexArrays(1, &data->vao);
 #endif
@@ -97 +97 @@
     if (data->nbufs > 0)
         glDeleteBuffers(data->nbufs, data->bufs);
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
     glDeleteVertexArrays(1, &data->vao);
 #endif
@@ -321 +321 @@
     glEnable(GL_DEPTH_TEST);
     glDepthFunc(GL_LEQUAL);
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
     glEnable(GL_ALPHA_TEST);
     glAlphaFunc(GL_GEQUAL, 0.01f);
@@ -360 +360 @@
 
         /* Bind vertex, color and texture coordinate buffers */
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
         glBindVertexArray(data->vao);
 #endif
@@ -387 +387 @@
         glDrawArrays(GL_TRIANGLES, 0, (n - i) * 6);
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
         glBindVertexArray(0);
 #endif

trunk/src/video.cpp

@@ -34 +34 @@
 private:
     static mat4 proj_matrix, view_matrix;
-#if defined __ANDROID__ || defined __CELLOS_LV2__
+#if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
     static ivec2 saved_viewport;
 #endif
@@ -42 +42 @@
 mat4 VideoData::view_matrix;
 
-#if defined __ANDROID__ || defined __CELLOS_LV2__
+#if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
 ivec2 VideoData::saved_viewport = 0;
 #endif
@@ -52 +52 @@
 void Video::Setup(ivec2 size)
 {
-#if defined USE_GLEW
+#if defined USE_GLEW && !defined __APPLE__
     /* Initialise GLEW if necessary */
     GLenum glerr = glewInit();
@@ -65 +65 @@
     glViewport(0, 0, size.x, size.y);
 
-#if defined __ANDROID__ || defined __CELLOS_LV2__
+#if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
     VideoData::saved_viewport = size;
 #endif
@@ -72 +72 @@
     glClearDepth(1.0);
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X && !defined __APPLE__
     glShadeModel(GL_SMOOTH);
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
@@ -184 +184 @@
     // FIXME: use psglCreateDeviceAuto && psglGetDeviceDimensions
     return VideoData::saved_viewport;
+#elif defined __APPLE__
+    return VideoData::saved_viewport;
 #else
     GLint v[4];