Changeset 1037 for code/trunk/src/orxonox/core

Timestamp:

Apr 13, 2008, 2:24:00 PM (16 years ago)

Author:

landauf

Message:

moved tolua from util to core because of circular dependencies
reverted some bugfixes in ParticleInterface

Location:

code/trunk/src/orxonox/core

Files:

• CMakeLists.txt (modified) (3 diffs)
• Script.cc (modified) (2 diffs)
• tolua (moved) (moved from code/trunk/src/util/tolua)
• tolua/tolua_bind.cc (modified) (1 diff)

code/trunk/src/orxonox/core/CMakeLists.txt

@@ +1 @@
+AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES)
+
 SET( CORE_SRC_FILES
+  ${TOLUA_SRC_FILES}
   OrxonoxClass.cc
   BaseObject.cc
@@ -7 +10 @@
   InputHandler.cc
   InputManager.cc
+  InputEventListener.cc
   MetaObjectList.cc
   ConfigValueContainer.cc
@@ -27 +31 @@
 TARGET_LINK_LIBRARIES( core
   util
+
   ${Lua_LIBRARIES}
+  ${OIS_LIBRARIES}
 )

code/trunk/src/orxonox/core/Script.cc

@@ -31 +31 @@
 #include <map>
 
-#include "../core/CoreIncludes.h"
+#include "CoreIncludes.h"
 
 extern "C" {
@@ -38 +38 @@
 }
 
-#include "util/tolua/tolua++.h"
-#include "util/tolua/tolua_bind.h"
+#include "tolua/tolua++.h"
+#include "tolua/tolua_bind.h"
 
 namespace orxonox

code/trunk/src/orxonox/core/tolua/tolua_bind.cc

@@ -14 +14 @@
 TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);
 
-#include "../../orxonox/core/Script.h"
+#include "../Script.h"
 
 /* function to register type */