Show
Ignore:
Timestamp:
03/04/09 11:41:21 (4 years ago)
Author:
shuber
Message:

merging from trunk using

svn merge -r 9847:9851 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk

Location:
OpenSceneGraph/branches/osg-cocoa-dev
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/osg-cocoa-dev

    • Property svn:mergeinfo changed from /OpenSceneGraph/trunk:9838-9843 to /OpenSceneGraph/trunk:9838-9843,9848-9851

  • OpenSceneGraph/branches/osg-cocoa-dev/examples/osgmovie/CMakeLists.txt

    r7025 r9853  
    1 #this file is automatically generated  
     1# INCLUDE_DIRECTORIES( ${OPENAL_INCLUDE_DIR} ) 
     2# SET(TARGET_EXTERNAL_LIBRARIES ${OPENAL_LIBRARY} alut) 
    23 
     4IF   (SDL_FOUND) 
     5    SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ) 
     6    INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ) 
     7    ADD_DEFINITIONS(-DUSE_SDL) 
     8ENDIF(SDL_FOUND) 
    39 
    410SET(TARGET_SRC osgmovie.cpp ) 
    511SET(TARGET_ADDED_LIBRARIES osgGA ) 
     12 
     13 
     14 
    615#### end var setup  ### 
    716SETUP_EXAMPLE(osgmovie)