Changeset 1975 for code/branches/buildsystem/src/orxonox

Timestamp:

Oct 20, 2008, 5:53:16 PM (16 years ago)

Author:

adrfried

Message:

lua removed and using extern one

Location:

code/branches/buildsystem/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• gui/GUIManager.cc (modified) (2 diffs)

code/branches/buildsystem/src/orxonox/CMakeLists.txt

@@ -97 +97 @@
   ${OGRE_LIBRARIES}
   ${CEGUI_LIBRARIES}
-  lua_orxonox
-  ceguilua_orxonox
+  ${LUA_LIBRARIES}
+  CEGUILuaScriptModule
   tinyxml_orxonox
   tolualib_orxonox

code/branches/buildsystem/src/orxonox/gui/GUIManager.cc

@@ -39 +39 @@
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include "ceguilua/CEGUILua.h"
+#include <CEGUILua.h>
 #include "util/Exception.h"
 #include "core/input/InputManager.h"
@@ -50 +50 @@
 #include "OgreCEGUIRenderer.h"
 
-#include "lua/lua.hpp"
+extern "C" {
+#include "lua.h"
+}
 
 namespace orxonox