Changeset 1846 for code/branches/orxonox_tutorial/src/core

Timestamp:

Sep 28, 2008, 2:27:03 PM (16 years ago)

Author:

rgrieder

Message:

Merged Revisions 1831 - 1845 to tutorial. This is an update from the trunk.

Location:

code/branches/orxonox_tutorial

Files:

• . (modified) (1 prop)
• src/core/BaseObject.h (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (3 diffs)
• src/core/Namespace.h (modified) (1 diff)
• src/core/Super.h (modified) (1 diff)
• src/core/XMLPort.h (modified) (1 diff)

code/branches/orxonox_tutorial/src/core/BaseObject.h

@@ -41 +41 @@
 #include "Super.h"
 #include "OrxonoxClass.h"
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 
 namespace orxonox

code/branches/orxonox_tutorial/src/core/CMakeLists.txt

@@ -56 +56 @@
 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
   COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
   DEPENDS
@@ -70 +70 @@
 TARGET_LINK_LIBRARIES(core
   ${OGRE_LIBRARIES}
+  ${Boost_thread_LIBRARIES}
+  ${Boost_filesystem_LIBRARIES}
   lua_orxonox
   cpptcl_orxonox
@@ -76 +78 @@
   tolualib_orxonox
   util
-  ${Boost_thread_LIBRARIES}
-  ${Boost_filesystem_LIBRARIES}
 )

code/branches/orxonox_tutorial/src/core/Namespace.h

@@ -34 +34 @@
 #include <map>
 
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 #include "BaseObject.h"
 

code/branches/orxonox_tutorial/src/core/Super.h

@@ -72 +72 @@
 
 #include "util/Debug.h"
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 
 ///////////////////////

code/branches/orxonox_tutorial/src/core/XMLPort.h

@@ -33 +33 @@
 
 #include "util/Debug.h"
-#include "util/XMLIncludes.h"
 #include "util/MultiType.h"
 #include "tinyxml/ticpp.h"
+#include "XMLIncludes.h"
 #include "Executor.h"
 #include "CoreIncludes.h"