Changeset 2710 for code/trunk/src/core/LuaBind.cc

Timestamp:

Feb 28, 2009, 7:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/core/LuaBind.cc (modified) (3 diffs, 1 prop)

code/trunk/src/core/LuaBind.cc

@@ -32 +32 @@
 #include <map>
 
-#include "lua/lua.hpp"
-#include "tolua/tolua++.h"
-#include "tolua/tolua_bind.h"
+extern "C" {
+#include <lua.h>
+#include <lualib.h>
+}
+#include <tolua/tolua++.h>
+#include <boost/filesystem.hpp>
+
 #include "util/String.h"
-#include "CoreIncludes.h"
+#include "util/Debug.h"
+#include "ToluaBindCore.h"
+#include "Core.h"
 
 namespace orxonox
@@ -46 +52 @@
     assert(LuaBind::singletonRef_s == 0);
     LuaBind::singletonRef_s = this;
+
+    this->includePath_ = Core::getMediaPathPOSIXString();
 
     luaState_ = lua_open();
@@ -78 +86 @@
   void LuaBind::loadFile(std::string filename, bool luaTags)
   {
+    boost::filesystem::path filepath(filename);
+
     output_ = "";
     std::ifstream file;
-    file.open(filename.c_str(), std::fstream::in);
+    file.open(filepath.file_string().c_str(), std::fstream::in);
 
     if (!file.is_open())