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

Removed dependency on GLUT.

Browse Source
This commit is contained in:
Robert Osfield 2008-11-17 15:53:04 +00:00
parent 5eaf95ed0f
commit ca5c93a983
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/CMakeLists.txt
View File

@ -112,9 +112,9 @@ IF(DYNAMIC_OPENSCENEGRAPH)
ADD_SUBDIRECTORY(osgpdf)
ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
IF (XUL_FOUND AND GTKGL_FOUND AND GLUT_FOUND)
IF (XUL_FOUND AND GTKGL_FOUND)
ADD_SUBDIRECTORY(osgbrowser)
ENDIF(XUL_FOUND AND GTKGL_FOUND AND GLUT_FOUND)
ENDIF(XUL_FOUND AND GTKGL_FOUND)
IF (BUILD_OSG_WRAPPERS)

5
examples/osgbrowser/CMakeLists.txt
View File

@ -21,8 +21,7 @@ ADD_DEFINITIONS(-DMOZILLA_INTERNAL_API)
# MESSAGE("XUL_LIBRARIES = " ${XUL_LIBRARIES})
# MESSAGE("XUL_INCLUDE_DIRS = " ${XUL_INCLUDE_DIRS})
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR}
${GTK_INCLUDE_DIRS} ${GTKGL_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}
${XUL_INCLUDE_DIRS}
/usr/include/xulrunner/locale
/usr/include/xulrunner/view
@ -47,7 +46,7 @@ INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR}
/usr/include/xulrunner/xpconnect
)
LINK_DIRECTORIES( ${XUL_LIB_DIRS})
SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES} ${GLUT_glut_LIBRARY})
SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES})
#### end var setup ###
SETUP_EXAMPLE(osgbrowser)