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

From Laurens Voerman, "two minor fixes, both in a CMakeList.txt file,

Browse Source 
1> osgmultiplemovies example does not use SDL so needs no link to SDL

2> Added header files to "Plugins osg" project, so visual studio can find the source of
   OSG_WARN <<  "AsciiInputIterator::readProperty(): Unmatched property "
"
This commit is contained in:
Robert Osfield 2013-09-09 12:33:18 +00:00
parent 7050c59cae
commit 61ccd56d25
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/osgmultiplemovies/CMakeLists.txt
View File

@ -1,14 +1,3 @@
# INCLUDE_DIRECTORIES( ${OPENAL_INCLUDE_DIR} )
# SET(TARGET_EXTERNAL_LIBRARIES ${OPENAL_LIBRARY} alut)
IF (SDL_FOUND)
SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} )
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )
ADD_DEFINITIONS(-DUSE_SDL)
IF (MINGW)
SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} winmm dinput ddraw dxguid)
ENDIF()
ENDIF(SDL_FOUND)
SET(TARGET_SRC osgmultiplemovies.cpp ) SET(TARGET_SRC osgmultiplemovies.cpp )
SET(TARGET_ADDED_LIBRARIES osgGA ) SET(TARGET_ADDED_LIBRARIES osgGA )

6
src/osgPlugins/osg/CMakeLists.txt
View File

@ -2,6 +2,10 @@ SET(TARGET_SRC
ReaderWriterOSG.cpp ReaderWriterOSG.cpp
ReaderWriterOSG2.cpp ReaderWriterOSG2.cpp
) )
SET(TARGET_H
AsciiStreamOperator.h
BinaryStreamOperator.h
XmlStreamOperator.h
)
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(osg) SETUP_PLUGIN(osg)