Changeset 1810 for code/trunk/src/orxonox

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/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• src/orxonox/gui/GUIManager.cc (modified) (2 diffs)

code/trunk/src/orxonox/CMakeLists.txt

@@ -66 +66 @@
 )
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
@@ -97 +97 @@
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
   ${CEGUI_LIBRARIES}
-  ${CEGUI_SCRIPT_LIBRARIES}
-  tinyxml
-  tolualib
+  lua_orxonox
+  ceguilua_orxonox
+  tinyxml_orxonox
+  tolualib_orxonox
   ois_orxonox
   util

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) && 0
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
 
 // including std headers here is useless since they're already precompiled

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