Changeset 486 for code/branches

Timestamp:

Dec 12, 2007, 9:49:44 PM (17 years ago)

Author:

nicolasc

Message:

• added missing CML in tinyxml
• minor cleanup in audio CML
• changed mesh to assf

Location:

code/branches/FICN/src

Files:

• audio/CMakeLists.txt (modified) (1 diff)
• orxonox/orxonox.cc (modified) (1 diff)
• tinyxml/CMakeLists.txt (added)

code/branches/FICN/src/audio/CMakeLists.txt

@@ -8 +8 @@
         AudioStream.cc
 )
-SET(INC_FILES
-        AudioManager.h
-        AudioBuffer.h
-        AudioSource.h
-        AudioStream.h
-)
+
 
 INCLUDE_DIRECTORIES(..)
 
-ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})
+ADD_LIBRARY(audio ${SRC_FILES})
 
 TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})

code/branches/FICN/src/orxonox/orxonox.cc

@@ -361 +361 @@
 
     
-    Entity* head = mgr->createEntity("head", "razor.mesh");
+    Entity* head = mgr->createEntity("ASSF", "assf.mesh");
     SceneNode *node = mgr->getRootSceneNode()->createChildSceneNode("OgreHeadNode", Vector3(0,0,0));
     node->attachObject(head);