Changeset 7941 for code/branches/kicklib/src/libraries/core

Timestamp:

Feb 20, 2011, 10:49:06 PM (14 years ago)

Author:

rgrieder

Message:

Kicked CEGUILua from our repository and adjusted the build system accordingly.
The Linux part is still missing though.

Location:

code/branches/kicklib/src/libraries/core

Files:

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

code/branches/kicklib/src/libraries/core/CMakeLists.txt

@@ -93 +93 @@
     ${CEGUI_LIBRARY}
     ${CEGUILUA_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     ${LUA_LIBRARIES}
     cpptcl_orxonox
@@ -98 +99 @@
     ois_orxonox
     tinyxml_orxonox
-    tolua_orxonox
     util
   SOURCE_FILES

code/branches/kicklib/src/libraries/core/GUIManager.cc

@@ -30 +30 @@
 #include "GUIManager.h"
 
+#include <memory>
 #include <boost/bind.hpp>
-#include <memory>
 
 #include <CEGUIDefaultLogger.h>
@@ -43 +43 @@
 #include <elements/CEGUIListbox.h>
 #include <elements/CEGUIListboxItem.h>
+
+#include <CEGUILua.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
-
-#include "SpecialConfig.h" // Configures the macro below
-#ifdef CEGUILUA_USE_INTERNAL_LIBRARY
-#   include <ceguilua/CEGUILua.h>
-#else
-#   include <CEGUILua.h>
-#endif
 
 #include "util/Clock.h"

code/branches/kicklib/src/libraries/core/LuaState.cc

@@ -30 +30 @@
 #include "LuaState.h"
 
-#include <tolua/tolua++.h>
+#include <tolua++.h>
 extern "C" {
 #include <lua.h>