Quellcode durchsuchen

ERR: remove automatic Carbon framework on osx

Yves Starreveld vor 23 Jahren
Ursprung
Commit
c8ed9d7452
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 1 1
      Modules/FindGLU.cmake
  2. 1 1
      Modules/FindOpenGL.cmake

+ 1 - 1
Modules/FindGLU.cmake

@@ -18,7 +18,7 @@ ELSE (WIN32)
     # this variable is used in a IF test. So let's set it to the OpenGL
     # this variable is used in a IF test. So let's set it to the OpenGL
     # framework. It does not harm to duplicate the OpenGL framework and it
     # framework. It does not harm to duplicate the OpenGL framework and it
     # might even help in case OPENGL_LIBRARY is not set.
     # might even help in case OPENGL_LIBRARY is not set.
-    SET(GLU_LIBRARY "-framework Carbon -framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX")
+    SET(GLU_LIBRARY "-framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX")
   ELSE (APPLE)
   ELSE (APPLE)
     FIND_PATH(GLU_INCLUDE_PATH GL/glu.h
     FIND_PATH(GLU_INCLUDE_PATH GL/glu.h
       ${OPENGL_INCLUDE_PATH}
       ${OPENGL_INCLUDE_PATH}

+ 1 - 1
Modules/FindOpenGL.cmake

@@ -14,7 +14,7 @@ IF (WIN32)
   ENDIF(BORLAND)
   ENDIF(BORLAND)
 ELSE (WIN32)
 ELSE (WIN32)
   IF (APPLE)
   IF (APPLE)
-    SET(OPENGL_LIBRARY "-framework Carbon -framework AGL -framework OpenGL" CACHE STRING "OpenGL library for OSX")
+    SET(OPENGL_LIBRARY "-framework AGL -framework OpenGL" CACHE STRING "OpenGL library for OSX")
   ELSE (APPLE)
   ELSE (APPLE)
      FIND_PATH(OPENGL_INCLUDE_PATH GL/gl.h 
      FIND_PATH(OPENGL_INCLUDE_PATH GL/gl.h 
        /usr/include 
        /usr/include