Changeset 1146

Timestamp:

Apr 23, 2008, 7:02:01 PM (16 years ago)

Author:

landauf

Message:

merged the last changes from trunk to console

Location:

code/branches/console/src/tolua

Files:

• CMakeLists.txt (modified) (1 diff)
• tolua.pkg (modified) (1 diff)

code/branches/console/src/tolua/CMakeLists.txt

@@ -40 +40 @@
 ADD_CUSTOM_COMMAND(
   OUTPUT tolua_bind.h tolua_bind.cc
-  COMMAND ${TOLUA_EXE} -n orxonox -o tolua/tolua_bind.cc -H tolua/tolua_bind.h tolua/tolua.pkg
+  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/tolua/tolua_bind.cc -H ../../src/tolua/tolua_bind.h ../../src/tolua/tolua.pkg
   DEPENDS tolua
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
 

code/branches/console/src/tolua/tolua.pkg

@@ -1 @@
-$cfile "core/Script_clean.h"
+$cfile "../../src/core/Script_clean.h"