Changeset 1048

Timestamp:

Apr 14, 2008, 12:26:11 AM (16 years ago)

Author:

rgrieder

Message:

• final commit for tolua++ displacement

Location:

code/trunk

Files:

• src/orxonox/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/core/Script.cc (modified) (1 diff)
• src/orxonox/core/Script.h (modified) (2 diffs)
• src/orxonox/core/ToLuaBind.cc (moved) (moved from code/trunk/src/orxonox/core/tolua_bind.cc) (1 diff)
• src/orxonox/core/ToLuaBind.h (moved) (moved from code/trunk/src/orxonox/core/tolua_bind.h)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)

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

@@ -21 +21 @@
   Tickable.cc
   Script.cc
+  ToLuaBind.cc
 )
 

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

@@ -34 +34 @@
 
 extern "C" {
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lualib.h>
+#include <lauxlib.h>
 }
 
-#include "tolua/tolua++.h"
-#include "tolua/tolua_bind.h"
+#include "util/tolua/tolua++.h"
+#include "ToLuaBind.h"
 
 namespace orxonox

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

@@ -8 +8 @@
 #define _Script_H__
 
+#include "CorePrereqs.h"
+
 extern "C" {
-#include "lua.h"
+#include <lua.h>
 }
 
@@ -18 +20 @@
 { // tolua_export
 
-  class Script // tolua_export
+  class _CoreExport Script // tolua_export
   { // tolua_export
     public:

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

@@ -9 +9 @@
 #include "string.h"
 
-#include "tolua++.h"
+#include "util/tolua/tolua++.h"
 
 /* Exported function */
 TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);
 
-#include "../Script.h"
+#include "Script.h"
 
 /* function to register type */

code/trunk/visual_studio/vc8/core.vcproj

@@ -229 +229 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\core\ToLuaBind.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\core\XMLPort.cc"
                                 >
@@ -359 +363 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\core\ToLuaBind.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\core\XMLPort.h"
                                 >