Changeset 1810 for code/trunk/src/orxonox/gui

Timestamp:

Sep 21, 2008, 8:44:25 PM (16 years ago)

Author:

rgrieder

Message:

merged ceguilua branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gui/GUIManager.cc (modified) (2 diffs)

code/trunk/src/orxonox/gui/GUIManager.cc

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