Revision: 7165
http://playerstage.svn.sourceforge.net/playerstage/?rev=7165&view=rev
Author: gerkey
Date: 2008-11-21 17:03:54 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
Fixed for build on OS X 10.5
Modified Paths:
--------------
code/player/trunk/utils/pmap/CMakeLists.txt
code/player/trunk/utils/pmap/lodo.cpp
code/player/trunk/utils/pmap/omap.cpp
code/player/trunk/utils/pmap/pmap.cpp
code/player/trunk/utils/pmap/pmap_test.cpp
code/player/trunk/utils/pmap/rmap.cpp
Modified: code/player/trunk/utils/pmap/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/pmap/CMakeLists.txt 2008-11-21 03:39:28 UTC (rev
7164)
+++ code/player/trunk/utils/pmap/CMakeLists.txt 2008-11-21 17:03:54 UTC (rev
7165)
@@ -33,14 +33,14 @@
PLAYER_ADD_EXECUTABLE (pmaptest ${pmaptestSrcs})
TARGET_LINK_LIBRARIES (pmaptest pmap lodo)
IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (pmaptest ${GLUT_LIBRARIES})
+ TARGET_LINK_LIBRARIES (pmaptest ${OPENGL_LIBRARIES}
${GLUT_LIBRARIES})
ENDIF (GLUT_FOUND)
SET_TARGET_PROPERTIES (pmaptest PROPERTIES
LINK_FLAGS "${GSL_LDFLAGS}")
PLAYER_ADD_LIBRARY (pmap ${pmapSrcs})
IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (pmap ${GLUT_LIBRARIES})
+ TARGET_LINK_LIBRARIES (pmap ${OPENGL_LIBRARIES}
${GLUT_LIBRARIES})
ENDIF (GLUT_FOUND)
SET_SOURCE_FILES_PROPERTIES (${pmapSrcs} PROPERTIES
COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
@@ -50,7 +50,7 @@
PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
TARGET_LINK_LIBRARIES (lodo playercore)
IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (lodo ${GLUT_LIBRARIES})
+ TARGET_LINK_LIBRARIES (lodo ${OPENGL_LIBRARIES}
${GLUT_LIBRARIES})
ENDIF (GLUT_FOUND)
SET_SOURCE_FILES_PROPERTIES (${lodoSrcs} PROPERTIES
COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
@@ -60,7 +60,7 @@
PLAYER_ADD_LIBRARY (lododriver ${lododriverSrcs})
TARGET_LINK_LIBRARIES (lododriver lodo)
IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (lododriver ${GLUT_LIBRARIES})
+ TARGET_LINK_LIBRARIES (lododriver ${OPENGL_LIBRARIES}
${GLUT_LIBRARIES})
ENDIF (GLUT_FOUND)
ELSE (GSL_PKG_FOUND)
MESSAGE (STATUS "pmap utilities will not be built - GSL not found")
Modified: code/player/trunk/utils/pmap/lodo.cpp
===================================================================
--- code/player/trunk/utils/pmap/lodo.cpp 2008-11-21 03:39:28 UTC (rev
7164)
+++ code/player/trunk/utils/pmap/lodo.cpp 2008-11-21 17:03:54 UTC (rev
7165)
@@ -38,8 +38,12 @@
#include "lodo.h"
#ifdef GLUT_FOUND
-#include <GL/glut.h>
+#ifdef __APPLE__
+ #include <glut.h>
+#else
+ #include <GL/glut.h>
#endif
+#endif
// GSL-styled callback function for minimization
Modified: code/player/trunk/utils/pmap/omap.cpp
===================================================================
--- code/player/trunk/utils/pmap/omap.cpp 2008-11-21 03:39:28 UTC (rev
7164)
+++ code/player/trunk/utils/pmap/omap.cpp 2008-11-21 17:03:54 UTC (rev
7165)
@@ -34,8 +34,12 @@
#include <string.h>
#ifdef GLUT_FOUND
-#include <GL/glut.h>
+#ifdef __APPLE__
+ #include <glut.h>
+#else
+ #include <GL/glut.h>
#endif
+#endif
#include "omap.h"
Modified: code/player/trunk/utils/pmap/pmap.cpp
===================================================================
--- code/player/trunk/utils/pmap/pmap.cpp 2008-11-21 03:39:28 UTC (rev
7164)
+++ code/player/trunk/utils/pmap/pmap.cpp 2008-11-21 17:03:54 UTC (rev
7165)
@@ -33,8 +33,12 @@
#include <gsl/gsl_randist.h>
#ifdef GLUT_FOUND
-#include <GL/glut.h>
+#ifdef __APPLE__
+ #include <glut.h>
+#else
+ #include <GL/glut.h>
#endif
+#endif
#include "pmap.h"
Modified: code/player/trunk/utils/pmap/pmap_test.cpp
===================================================================
--- code/player/trunk/utils/pmap/pmap_test.cpp 2008-11-21 03:39:28 UTC (rev
7164)
+++ code/player/trunk/utils/pmap/pmap_test.cpp 2008-11-21 17:03:54 UTC (rev
7165)
@@ -157,8 +157,12 @@
#include <sys/time.h>
#ifdef GLUT_FOUND
-#include <GL/glut.h>
+#ifdef __APPLE__
+ #include <glut.h>
+#else
+ #include <GL/glut.h>
#endif
+#endif
#include "logfile.h"
#include "lodo.h"
Modified: code/player/trunk/utils/pmap/rmap.cpp
===================================================================
--- code/player/trunk/utils/pmap/rmap.cpp 2008-11-21 03:39:28 UTC (rev
7164)
+++ code/player/trunk/utils/pmap/rmap.cpp 2008-11-21 17:03:54 UTC (rev
7165)
@@ -34,8 +34,12 @@
#include "pmapconfig.h"
#ifdef GLUT_FOUND
-#include <GL/glut.h>
+#ifdef __APPLE__
+ #include <glut.h>
+#else
+ #include <GL/glut.h>
#endif
+#endif
#include "rmap.h"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
