FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Olaf Flebbe, fixes for OSX AGL build

Browse Source
This commit is contained in:
Robert Osfield
2011-05-25 09:34:02 +00:00
parent e0f4fa453c
commit bf7759829e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -212,8 +212,9 @@ IF(APPLE)
FIND_LIBRARY(CARBON_LIBRARY Carbon)
FIND_LIBRARY(COCOA_LIBRARY Cocoa)
# Apple OS X: Find OpenGL
# Apple OS X: Find OpenGL and AGL
FIND_PACKAGE(OpenGL)
FIND_LIBRARY(AGL_LIBRARY AGL)
ENDIF ()
OPTION(OSG_COMPILE_FRAMEWORKS "compile frameworks instead of dylibs (experimental)" OFF)

3
src/osgViewer/CMakeLists.txt
View File

@@ -134,8 +134,7 @@ ELSE()
PixelBufferCarbon.cpp
)
SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
SET(LIB_EXTRA_LIBS ${LIB_EXTRA_LIBS} "-framework AGL")
SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${AGL_LIBRARY} ${LIB_EXTRA_LIBS})
ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "IOS")