Changeset 2619 for code

Timestamp:

Jan 29, 2009, 11:20:37 PM (16 years ago)

Author:

rgrieder

Message:

Removed src/util/OrxonoxPlatform.h and added src/OrxonoxConfig.h.in that gets configured by CMake.

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxConfig.h.in (moved) (moved from code/branches/buildsystem2/src/util/OrxonoxPlatform.h) (1 diff)
• audio/AudioPrereqs.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• network/NetworkPrereqs.h (modified) (1 diff)
• orxonox/Main.cc (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (1 diff)
• util/Integers.h (modified) (1 diff)
• util/Sleep.h (modified) (1 diff)
• util/UtilPrereqs.h (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ +1 @@
+################ OrxonoxConfig.h ################
+
+# Copy and configure OrxonoxConfig which gets included in every file
+CONFIGURE_FILE(OrxonoxConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h)
+
 # Set the search paths for include files
 INCLUDE_DIRECTORIES(

code/branches/buildsystem2/src/OrxonoxConfig.h.in

@@ -136 +136 @@
 #endif
 }
+
+/* Set whether we must suffix "ceguilua/" for the CEGUILua.h include */
+#cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY
 
 //-----------------------------------------------------------------------

code/branches/buildsystem2/src/audio/AudioPrereqs.h

@@ -35 +35 @@
 #define _AudioPrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 //-----------------------------------------------------------------------

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

@@ -35 +35 @@
 #define _CorePrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 #include <string>

code/branches/buildsystem2/src/network/NetworkPrereqs.h

@@ -35 +35 @@
 #define _NetworkPrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 //-----------------------------------------------------------------------

code/branches/buildsystem2/src/orxonox/Main.cc

@@ -38 +38 @@
 #include <cassert>
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 #include "util/Debug.h"
 #include "util/SignalHandler.h"

code/branches/buildsystem2/src/orxonox/OrxonoxPrereqs.h

@@ -35 +35 @@
 #define _OrxonoxPrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 //-----------------------------------------------------------------------

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

@@ -9 +9 @@
 )
 SET_TARGET_PROPERTIES(tolualib_orxonox PROPERTIES DEFINE_SYMBOL "TOLUA_SHARED_BUILD")
-TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARY})
+TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
 
 IF (NOT WIN32)

code/branches/buildsystem2/src/util/Integers.h

@@ -36 +36 @@
 #define _Integers_H__
 
-#include "OrxonoxPlatform.h"
+#include "UtilPrereqs.h"
 
 /* Define fixed with integers

code/branches/buildsystem2/src/util/Sleep.h

@@ -36 +36 @@
 #define _Sleep_H__
 
-#include "OrxonoxPlatform.h"
+#include "UtilPrereqs.h"
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32

code/branches/buildsystem2/src/util/UtilPrereqs.h

@@ -35 +35 @@
 #define _UtilPrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 //-----------------------------------------------------------------------