Changeset 1032 for code/trunk/src/orxonox/OrxonoxPlatform.h

Timestamp:

Apr 12, 2008, 4:08:29 PM (17 years ago)

Author:

rgrieder

Message:

• singletonized GraphicsEngine —> Orxonox.h has to included only twice —> better compile performance —> Everything graphic related can now be accessed with GraphicsEngine::getSingleton()
• asylumized Fighter (SpaceShip with weapon system integrated)
• removed weapon system from build

File:

• code/trunk/src/orxonox/OrxonoxPlatform.h (modified) (6 diffs)

code/trunk/src/orxonox/OrxonoxPlatform.h

@@ -22 +22 @@
  *      An unknown man from the Ogre development crew
  *   Co-authors:
- *      Reto Grieder (OGRE --> ORXONOX)
+ *      Reto Grieder
  *
  */
 
 /**
- @file  OrxonoxPlatform.h
+ @file
  @brief Various constants for compiler, architecture and platform. It's a mere
         copy of the file found in the Ogre source code (OgrePlatform.h).
@@ -108 +108 @@
 // As a side note, if you start your message with 'Warning: ', the MSVC
 // IDE actually does catch a warning :)
-#define ORXONOX_QUOTE_INPLACE(x) # x
-#define ORXONOX_QUOTE(x) ORXONOX_QUOTE_INPLACE(x)
-#define ORXONOX_WARN( x )  message( __FILE__ "(" QUOTE( __LINE__ ) ") : " x "\n" )
+// FIXME: Try this on linux box. Doesn't work with msvc
+//#define ORXONOX_QUOTE_INPLACE(x) # x
+//#define ORXONOX_QUOTE(x) ORXONOX_QUOTE_INPLACE(x)
+//#define ORXONOX_WARN( x )  message( __FILE__ "(" QUOTE( __LINE__ ) ") : " x "\n" )
 
 //----------------------------------------------------------------------------
@@ -137 +138 @@
 #  endif
 
-#endif
+#endif /* Platform Win32 */
 //----------------------------------------------------------------------------
 
@@ -171 +172 @@
 #  define ORXONOX_UNICODE_SUPPORT 1
 
-#endif
+#endif /* Patform Linux/Apple */
 
 //For apple, we always have a custom config.h file
@@ -191 +192 @@
 // Integer formats of fixed bit width
 // FIXME: consider 64 bit platforms!
-/*typedef unsigned int uint32;
-typedef unsigned short uint16;
-typedef unsigned char uint8;*/
+//typedef unsigned int uint32;
+//typedef unsigned short uint16;
+//typedef unsigned char uint8;
 
 #ifdef ORXONOX_DOUBLE_PRECISION
@@ -261 +262 @@
 //#   pragma warning (disable : 201)
 
-#endif
-
 
 // Define the english written operators like and, or, xor
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-#  include <iso646.h>
-#endif
+#include <iso646.h>
+
+#endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC */
+
+// include visual leak detector to search for memory leaks
+//#include <vld.h>
 
 } /* namespace orxonox */
 
-// include visual leak detector to search for memory links
-//#include <vld.h>
-
 #endif /* _OrxonoxPlatform_H__ */