Changeset 2509 for code/branches/buildsystem2/src/core

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/CommandExecutor.h (modified) (1 diff)
• src/core/LuaBind.cc (modified) (1 diff, 1 prop)
• src/core/LuaBind.h (modified) (2 diffs, 1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/core/tolua (deleted)

code/branches/buildsystem2/src/core/CMakeLists.txt

@@ -42 +42 @@
   TclThreadManager.cc
 
-  tolua/tolua_bind.cc
 )
 
 ADD_SOURCE_DIRECTORY(CORE_SRC_FILES input)
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
-  COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
-  DEPENDS
-    tolua_orxonox
-    tolua/tolua.pkg
-    LuaBind.h
-    CommandExecutor.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
+INCLUDE(UseTolua)
+TOLUA(Core CORE_SRC_FILES INPUTFILES LuaBind.h CommandExecutor.h)
 
 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
 
 TARGET_LINK_LIBRARIES(core
-  ${OGRE_LIBRARIES}
-  ${Boost_thread_LIBRARIES}
-  ${Boost_filesystem_LIBRARIES}
-  lua_orxonox
+  ${OGRE_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
+  ${Boost_FILESYSTEM_LIBRARY}
+  ${LUA_LIBRARIES}
   cpptcl_orxonox
   ois_orxonox

code/branches/buildsystem2/src/core/CommandExecutor.h

@@ -36 +36 @@
 #include "CommandEvaluation.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
     class _CoreExport CommandExecutor
-    /*
-    class CommandExecutor { // tolua_export
-    */
     {
+// tolua_end
         public:
             static bool execute(const std::string& command, bool useTcl = true); // tolua_export

code/branches/buildsystem2/src/core/LuaBind.cc

@@ -32 +32 @@
 #include <map>
 
-#include "lua/lua.hpp"
-#include "tolua/tolua++.h"
-#include "tolua/tolua_bind.h"
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+}
+#include "tolua++.h"
+#include "core/ToluaBindCore.h"
 #include "util/String.h"
 #include "CoreIncludes.h"

code/branches/buildsystem2/src/core/LuaBind.h

@@ -39 +39 @@
 
 extern "C" {
-#include <lua/lua.h>
+#include <lua.h>
 }
 
@@ -45 +45 @@
 #include <string>
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
   class _CoreExport LuaBind
   {
-  /*
-  class LuaBind { // tolua_export
-  */
+
+// tolua_end
     struct LoadS {
       const char *s;