Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
This commit is contained in:
commit
f4c4f76370
@ -232,7 +232,7 @@ ELSE()
|
|||||||
IF(OSGVIEWER_USE_XINERAMA)
|
IF(OSGVIEWER_USE_XINERAMA)
|
||||||
ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA)
|
ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA)
|
||||||
SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} )
|
SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} )
|
||||||
SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS})
|
SET(LIB_EXTRA_LIBS ${X11_Xinerama_LIB} ${LIB_EXTRA_LIBS})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
# X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
|
# X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
|
||||||
|
Loading…
Reference in New Issue
Block a user