Changeset 5740 for code/branches/ggz2/src/orxonox

Timestamp:

Sep 1, 2009, 5:35:16 PM (15 years ago)

Author:

landauf

Message:

merged ggz into ggz2

Location:

code/branches/ggz2

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/GGZClient.cc (copied) (copied from code/branches/ggz/src/orxonox/GGZClient.cc) (1 prop)
• src/orxonox/GGZClient.h (copied) (copied from code/branches/ggz/src/orxonox/GGZClient.h) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)

code/branches/ggz2/src/orxonox/CMakeLists.txt

@@ -30 +30 @@
   Scene.cc
 )
+
+IF(GGZMOD_FOUND)
+  ADD_SOURCE_FILES(ORXONOX_SRC_FILES GGZClient.cc)
+ENDIF(GGZMOD_FOUND)
 
 ADD_SUBDIRECTORY(collisionshapes)
@@ -65 +69 @@
     ${VORBIS_LIBRARY}
     ${OGG_LIBRARY}
+    ${GGZMOD_LIBRARIES}
     tinyxml++_orxonox
     tolua++_orxonox

code/branches/ggz2/src/orxonox/OrxonoxPrereqs.h

@@ -193 +193 @@
     class SoundManager;
     class SoundMainMenu;
+
+    // GGZ
+    class GGZClient;
 }