[Hdrflow-svn] SF.net SVN: hdrflow: [156] trunk/lib/openlibraries

[<gl...@us...>]

Revision: 156
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=156&view=rev
Author:   glslang
Date:     2007-06-22 05:11:54 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
+universal build updates

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp
    trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp	2007-06-22 10:19:40 UTC (rev 155)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp	2007-06-22 12:11:54 UTC (rev 156)
@@ -97,6 +97,7 @@
 };
 #endif
 
+#ifndef __ppc__
 template<class time_value_policy, template<class> class sleep_policy>
 class rdtsc : public time_value_policy, public sleep_policy<time_value_policy>
 {
@@ -254,6 +255,7 @@
 	ticks_type stop_;
 	ticks_type ticks_per_microsec_;
 };
+#endif
 
 #ifndef WIN32
 template<class time_value_policy, template<class> class sleep_policy>
@@ -330,8 +332,10 @@
 #ifdef WIN32
 	typedef timer<rdtsc<time_value, event_sleep> > 			rdtsc_default_timer;
 #else
-#	if GCC_VERSION >= 40000 && !defined __ppc 
+#	if GCC_VERSION >= 40000 && !defined __ppc__ 
 		typedef timer<rdtsc<time_value, nanosleep_> > 		rdtsc_default_timer;
+#	else
+		typedef timer<gettimeofday_<time_value, nanosleep_> > 	rdtsc_default_timer;
 #	endif
 	typedef timer<gettimeofday_<time_value, nanosleep_> >	gettimeofday_default_timer;
 #endif

Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am	2007-06-22 10:19:40 UTC (rev 155)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am	2007-06-22 12:11:54 UTC (rev 156)
@@ -10,7 +10,8 @@
 
 tm_bench_CXXFLAGS = 		\
 	$(OLIB_CXXFLAGS)	\
-	$(BOOST_INCLUDE_PATH)
+	$(BOOST_INCLUDE_PATH)	\
+	$(GLEW_INCLUDE_PATH)
 
 tm_bench_LDFLAGS =		\
 	$(OLIB_LDFLAGS)		\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.