Changeset 1882 for code/branches/buildsystem/src/core

Timestamp:

Oct 5, 2008, 12:04:16 AM (16 years ago)

Author:

adrfried

Message:

out-of-source-builds working in basics

Location:

code/branches/buildsystem/src/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Script.cc (modified) (1 diff)
• tolua/tolua.pkg (deleted)

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

@@ -50 +50 @@
   input/KeyDetector.cc
   input/SimpleInputState.cc
-
-  tolua/tolua_bind.cc
 )
 
-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
-    Script.h
-    CommandExecutor.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
+INCLUDE(UseTolua)
+TOLUA(Core CORE_SRC_FILES INPUTFILES Script.h CommandExecutor.h)
 
 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})

code/branches/buildsystem/src/core/Script.cc

@@ -36 +36 @@
 #include "lua/lua.hpp"
 
-#include "tolua/tolua++.h"
-#include "tolua/tolua_bind.h"
+#include "tolua++.h"
+#include "tolua_bind.h"
 
 namespace orxonox