Changeset 1724 for code/branches/gui/src/orxonox/OrxonoxStableHeaders.h

Timestamp:

Sep 6, 2008, 9:51:01 PM (16 years ago)

Author:

rgrieder

Message:

• changed library dependency dir to lib_precompiled/include/ in msvc properties
• fixed a bug with tolua pkg file in msvc
• (u)int64_t to (unsigned) long long (C-Standard, so most c++ will have it anyway)

File:

• code/branches/gui/src/orxonox/OrxonoxStableHeaders.h (modified) (5 diffs)

code/branches/gui/src/orxonox/OrxonoxStableHeaders.h

@@ -28 +28 @@
 
 /**
- @file  OrxonoxStableHeaders.h
- @brief Contains the bigger (or smaller) header files in order to precompile them with MSVC
+ @file
+ @brief Contains the frequently used header files of our own writing
  */
 
@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
 
 // including std headers here is useless since they're already precompiled
@@ -45 +45 @@
 #  define WIN32_LEAN_AND_MEAN
 #endif
-
 #include <Ogre.h>
 #include <CEGUI.h>
@@ -53 +52 @@
 #include <boost/thread/thread.hpp>
 
-//-----------------------------------------------------------------------
-// ORXONOX HEADERS
-//-----------------------------------------------------------------------
-
 #include "tinyxml/ticpp.h"
 #include "tinyxml/tinyxml.h"
+
+
+//----------- Our files ----------
+//--------------------------------
+// only include when not debugging so that we may find issues with missing headers quicker
+#if defined(NDEBUG)
 
 #include "util/Convert.h"
@@ -88 +89 @@
 //#include "objects/WorldEntity.h"
 
-#endif /* Compiler MSVC */
+#endif /* ifdef NDEBUG */
+
+#endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) */
 
 #endif /* _OrxonoxStableHeaders_H__ */