Changeset 8045 for code/branches/mac_osx

Timestamp:

Mar 8, 2011, 6:27:31 AM (14 years ago)

Author:

rgrieder

Message:

Simplified a workaround.

Location:

code/branches/mac_osx/src

Files:

• OrxonoxConfig.cmake (modified) (1 diff)
• OrxonoxConfig.h.in (modified) (1 diff)

code/branches/mac_osx/src/OrxonoxConfig.cmake

@@ -69 +69 @@
 ENDIF(MSVC)
 
-# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
-IF(HAVE_STDINT_H)
-  SET(HAVE_STDINT_H 1)
-ELSE()
-  SET(HAVE_STDINT_H 0)
-ENDIF()
-
 # Check iso646.h include (literal operators)
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
+
+# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
+SET(ORX_HAVE_STD_INT HAVE_STDINT_H)
 
 ############## Configured Headers ###############

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

@@ -162 +162 @@
 
 // On OS X some headers already define HAVE_STDINT_H and that spits out
-// some warnings. Therefore we use this syntax.
+// some warnings. Therefore we use this macro.
 // Note: This requires some extra code in OrxonoxConfig.cmake
-#if @HAVE_STDINT_H@
+#cmakedefine ORX_HAVE_STDINT_H
+#ifdef ORX_HAVE_STDINT_H
 #  include <stdint.h>
 #elif defined(ORXONOX_COMPILER_MSVC)