Changeset 1810 for code/trunk/src/core

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/core/CMakeLists.txt (modified) (2 diffs)
• src/core/Script.cc (modified) (1 diff)
• src/core/Script.h (modified) (1 diff)

code/trunk/src/core/CMakeLists.txt

@@ -54 +54 @@
 )
 
-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
@@ -65 +65 @@
 
 TARGET_LINK_LIBRARIES(core
-  ${Lua_LIBRARIES}
   ${OGRE_LIBRARIES}
-  cpptcl
+  lua_orxonox
+  cpptcl_orxonox
   ois_orxonox
-  tinyxml
-  tolualib
+  tinyxml_orxonox
+  tolualib_orxonox
   util
   ${Boost_thread_LIBRARIES}

code/trunk/src/core/Script.cc

@@ -34 +34 @@
 #include "CoreIncludes.h"
 
-extern "C" {
-#include <lualib.h>
-#include <lauxlib.h>
-}
+#include "lua/lua.hpp"
 
 #include "tolua/tolua++.h"

code/trunk/src/core/Script.h

@@ -39 +39 @@
 
 extern "C" {
-#include <lua.h>
+#include "lua/lua.h"
 }