Changeset 1209 for code/trunk/src

Timestamp:

Apr 30, 2008, 7:57:57 PM (17 years ago)

Author:

rgrieder

Message:

• moved tinyxml and tolua folders

Location:

code/trunk/src

Files:

• CMakeLists.txt (modified) (1 diff)
• core/BaseObject.cc (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• core/Loader.cc (modified) (1 diff)
• core/XMLPort.h (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• orxonox/objects/Ambient.cc (modified) (1 diff)
• orxonox/objects/Camera.cc (modified) (1 diff)
• orxonox/objects/Model.cc (modified) (1 diff)
• orxonox/objects/Skybox.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.cc (modified) (1 diff)
• orxonox/objects/weapon/AmmunitionDump.cc (modified) (1 diff)
• orxonox/objects/weapon/BulletManager.h (modified) (1 diff)
• tinyxml (moved) (moved from code/trunk/src/util/tinyxml)
• tinyxml/CMakeLists.txt (added)
• tolua (moved) (moved from code/trunk/src/util/tolua)
• tolua/CMakeLists.txt (modified) (2 diffs)
• util/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(orxonox)
-INCLUDE_DIRECTORIES(util/tolua)
+INCLUDE_DIRECTORIES(tolua)
 
+ADD_SUBDIRECTORY(tinyxml)
+ADD_SUBDIRECTORY(tolua)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)

code/trunk/src/core/BaseObject.cc

@@ -33 +33 @@
 
 #include "BaseObject.h"
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "CoreIncludes.h"
 #include "XMLPort.h"

code/trunk/src/core/CMakeLists.txt

@@ -52 +52 @@
   ${OIS_LIBRARIES}
   ${OGRE_LIBRARIES}
+  tinyxml
+  tolualib
   util
 )

code/trunk/src/core/Loader.cc

@@ -37 +37 @@
 #include "Namespace.h"
 
-#include "util/tinyxml/ticpp.h"
+#include "tinyxml/ticpp.h"
 
 namespace orxonox

code/trunk/src/core/XMLPort.h

@@ -34 +34 @@
 #include "util/XMLIncludes.h"
 #include "util/MultiTypeMath.h"
-#include "util/tinyxml/ticpp.h"
+#include "tinyxml/ticpp.h"
 #include "Executor.h"
 #include "Debug.h"

code/trunk/src/orxonox/CMakeLists.txt

@@ -55 +55 @@
   ${OGRE_LIBRARIES}
   ${Lua_LIBRARIES}
+  tinyxml
+  tolualib
   util
   core

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -95 +95 @@
 #include "util/SubString.h"
 //#include "util/XMLIncludes.h"
-#include "util/tinyxml/ticpp.h"
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/ticpp.h"
+#include "tinyxml/tinyxml.h"
 
 #include "core/BaseObject.h"

code/trunk/src/orxonox/objects/Ambient.cc

@@ -35 +35 @@
 #include <OgreSceneManager.h>
 
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "util/SubString.h"
 #include "util/Convert.h"

code/trunk/src/orxonox/objects/Camera.cc

@@ -37 +37 @@
 #include <OgreViewport.h>
 
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "util/SubString.h"
 #include "util/Convert.h"

code/trunk/src/orxonox/objects/Model.cc

@@ -30 +30 @@
 #include "Model.h"
 
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"

code/trunk/src/orxonox/objects/Skybox.cc

@@ -34 +34 @@
 #include <OgreSceneManager.h>
 
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "GraphicsEngine.h"
 #include "core/CoreIncludes.h"

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -38 +38 @@
 #include <OgreSceneNode.h>
 
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "util/Convert.h"
 #include "util/Math.h"

code/trunk/src/orxonox/objects/WorldEntity.cc

@@ -33 +33 @@
 #include <sstream>
 
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "util/SubString.h"
 #include "core/CoreIncludes.h"

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc

@@ -32 +32 @@
 #include "orxonox/Orxonox.h"
 #include "BulletManager.h"
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "core/CoreIncludes.h"
 

code/trunk/src/orxonox/objects/weapon/BulletManager.h

@@ -38 +38 @@
 
 #include "network/Synchronisable.h"
-#include "util/tinyxml/tinyxml.h"
+#include "tinyxml/tinyxml.h"
 #include "core/BaseObject.h"
 #include "core/Tickable.h"

code/trunk/src/tolua/CMakeLists.txt

@@ -1 @@
-SET(TOLUA_SRC_FILES
-  tolua.c
+SET (TOLUALIB_SRC_FILES
   tolua_event.c
   tolua_is.c
@@ -6 +5 @@
   tolua_push.c
   tolua_to.c
+)
+
+ADD_LIBRARY (tolualib ${TOLUALIB_SRC_FILES})
+
+TARGET_LINK_LIBRARIES (tolualib
+  ${Lua_LIBRARIES}
+)
+
+SET (TOLUAEXE_SRC_FILES
+  tolua.c
   toluabind.c
 )
 
-ADD_EXECUTABLE(tolua ${TOLUA_SRC_FILES})
+ADD_EXECUTABLE (tolua ${TOLUAEXE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES(tolua
+TARGET_LINK_LIBRARIES (tolua
   ${Lua_LIBRARIES}
+  tolualib
   m
 )
-

code/trunk/src/util/CMakeLists.txt

@@ -9 +9 @@
   String.cc
   SubString.cc
-
-  tinyxml/ticpp.cc
-  tinyxml/tinystr.cc
-  tinyxml/tinyxml.cc
-  tinyxml/tinyxmlerror.cc
-  tinyxml/tinyxmlparser.cc
-
-  tolua/tolua_event.c
-  tolua/tolua_is.c
-  tolua/tolua_map.c
-  tolua/tolua_push.c
-  tolua/tolua_to.c
 )
 
@@ -32 +20 @@
   ${OGRE_LIBRARIES}
   ${Lua_LIBRARIES}
-) 
-
-ADD_SUBDIRECTORY(tolua)
-
+)