Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[Manta] Compiling on LLVM


Chronological Thread 
  • From: Kevin Tew <tewk@cs.utah.edu>
  • To: "'manta@sci.utah.edu'" <manta@sci.utah.edu>
  • Subject: [Manta] Compiling on LLVM
  • Date: Tue, 08 Jan 2008 16:16:35 -0700
llvm-gcc defines __APPLE__ as a builtin define.
So I added the following guard to make including #include <ppc_intrinsics.h> conditional.

Comments, suggestions welcome.

Kevin Tew

Index: Core/Util/CPUTime.cc
===================================================================
--- Core/Util/CPUTime.cc    (revision 1979)
+++ Core/Util/CPUTime.cc    (working copy)
@@ -2,7 +2,9 @@
#include <Core/Thread/ThreadError.h>

#if defined(__APPLE__)
+#if defined(__POWERPC__)
#include <ppc_intrinsics.h>
+#endif
#include <mach/mach.h>
#include <mach/mach_time.h>
#elif _WIN32
@@ -104,7 +106,7 @@
  return static_cast<unsigned long long>(a) |
        (static_cast<unsigned long long>(d) << 32);
}
-#endif // defined(__APPLE__) && defined(__POWERPC__)
+#endif // defined(__APPLE__)

//////////
// Return the current CPU time, in terms of seconds.

Index: Core/Util/CPUTime.cc
===================================================================
--- Core/Util/CPUTime.cc        (revision 1979)
+++ Core/Util/CPUTime.cc        (working copy)
@@ -2,7 +2,9 @@
 #include <Core/Thread/ThreadError.h>
 
 #if defined(__APPLE__)
+#if defined(__POWERPC__)
 #include <ppc_intrinsics.h>
+#endif
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 #elif _WIN32
@@ -104,7 +106,7 @@
   return static_cast<unsigned long long>(a) |
         (static_cast<unsigned long long>(d) << 32);
 }
-#endif // defined(__APPLE__) && defined(__POWERPC__)
+#endif // defined(__APPLE__)
 
 //////////
 // Return the current CPU time, in terms of seconds.

  • [Manta] Compiling on LLVM, Kevin Tew, 01/08/2008

Archive powered by MHonArc 2.6.16.

Top of page