Changeset 1414 for code/branches/network/src/util

Timestamp:

May 24, 2008, 10:08:42 PM (17 years ago)

Author:

rgrieder

Message:

• moved OrxonoxPlatform.h to util (didn't even notice util recently)
• therefore was able to define uint32_t, etc. for all our libs in OrxonoxPlatform.h
• made use of OgreRenderWindow::getAverageFPS() in HUD

Location:

code/branches/network/src/util

Files:

• OrxonoxPlatform.h (moved) (moved from code/branches/network/src/orxonox/OrxonoxPlatform.h) (4 diffs)
• UtilPrereqs.h (modified) (1 diff)

code/branches/network/src/util/OrxonoxPlatform.h

@@ -36 +36 @@
 #define _OrxonoxPlatform_H__
 
-namespace orxonox {
 /* Initial platform/compiler-related stuff to set.
 */
@@ -191 +190 @@
 #endif
 
-// Integer formats of fixed bit width
-// FIXME: consider 64 bit platforms!
-//typedef unsigned int uint32;
-//typedef unsigned short uint16;
-//typedef unsigned char uint8;
-// proper approach
-
+//-----------------------------------------------------------------------
+// fixed width integers
+//-----------------------------------------------------------------------
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+#else
+# include "inttypes.h"
+#endif
+
+namespace orxonox {
 #ifdef ORXONOX_DOUBLE_PRECISION
 typedef double Real;
@@ -203 +212 @@
 typedef float Real;
 #endif
+}
 
 
@@ -270 +280 @@
 //#include <vld.h>
 
-} /* namespace orxonox */
-
 #endif /* _OrxonoxPlatform_H__ */

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

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