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

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/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• gui/GUIManager.cc (modified) (1 diff)
• tolua/tolua.pkg (deleted)

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

@@ -62 +62 @@
   objects/RotatingProjectile.cc
   objects/ParticleProjectile.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 Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
-  DEPENDS
-    tolua_orxonox
-    tolua/tolua.pkg
-    gui/GUIManager.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
-        
+INCLUDE(UseTolua)
+TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
+
+SET(CORE_SUBDIR src/core)
+SET(CORE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/${CORE_SUBDIR}")
+SET(CORE_BINARY_DIR "${CMAKE_BINARY_DIR}/${CORE_SUBDIR}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
+
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 
@@ -110 +106 @@
   network
 )
-

code/branches/buildsystem/src/orxonox/gui/GUIManager.cc

@@ -43 +43 @@
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
-#include "core/tolua/tolua_bind.h"
+#include "../core/tolua_bind.h"
 #include "core/ConsoleCommand.h"
 #include "core/Core.h"
-#include "tolua/tolua_bind.h"
+#include "tolua_bind.h"
 #include "GraphicsEngine.h"
 #include "OgreCEGUIRenderer.h"