Revision: 6607
http://playerstage.svn.sourceforge.net/playerstage/?rev=6607&view=rev
Author: gbiggs
Date: 2008-06-16 18:23:36 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Fixed some bad paths, cleaned up glut check for pmap.
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/CMakeLists.txt
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/config.h.in
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/libplayertcp/CMakeLists.txt
code/player/trunk/replace/clock_gettime.c
code/player/trunk/server/libplayerdrivers/CMakeLists.txt
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/client_libs/libplayerc/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/CMakeLists.txt 2008-06-17
01:09:01 UTC (rev 6606)
+++ code/player/trunk/client_libs/libplayerc/CMakeLists.txt 2008-06-17
01:23:36 UTC (rev 6607)
@@ -49,9 +49,9 @@
dev_vectormap.c
dev_wifi.c
dev_wsn.c)
-IF(NOT HAVE_POLL)
- SET(playercSrcs ${playercSrcs} ../../replace/poll.c)
-ENDIF(NOT HAVE_POLL)
+IF (NOT HAVE_POLL)
+ SET (playercSrcs ${playercSrcs} ${PROJECT_SOURCE_DIR}/replace/poll.c)
+ENDIF (NOT HAVE_POLL)
APPEND_TO_CACHED_LIST (PLAYERC_EXTRA_LINK_LIBRARIES "Libs to link to with
playerc" z m)
PLAYER_ADD_LIBRARY (playerc ${playercSrcs})
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2008-06-17
01:09:01 UTC (rev 6606)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2008-06-17
01:23:36 UTC (rev 6607)
@@ -7,9 +7,6 @@
CHECK_FUNCTION_EXISTS (cfmakeraw HAVE_CFMAKERAW)
CHECK_FUNCTION_EXISTS (dirname HAVE_DIRNAME)
CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO)
-CHECK_LIBRARY_EXISTS (GL glBegin "" HAVE_LIBGL)
-CHECK_LIBRARY_EXISTS (GLU main "" HAVE_LIBGLU)
-CHECK_LIBRARY_EXISTS (glut main "" HAVE_LIBGLUT)
CHECK_LIBRARY_EXISTS (ltdl lt_dlopenext "" HAVE_LIBLTDL)
CHECK_INCLUDE_FILES (linux/joystick.h HAVE_LINUX_JOYSTICK_H)
CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
Modified: code/player/trunk/config.h.in
===================================================================
--- code/player/trunk/config.h.in 2008-06-17 01:09:01 UTC (rev 6606)
+++ code/player/trunk/config.h.in 2008-06-17 01:23:36 UTC (rev 6607)
@@ -13,9 +13,6 @@
//#cmakedefine HAVE_JPEGLIB_H 1
//#cmakedefine HAVE_LIBJPEG 1
#cmakedefine HAVE_JPEG 1
-#cmakedefine HAVE_LIBGL 1
-#cmakedefine HAVE_LIBGLU 1
-#cmakedefine HAVE_LIBGLUT 1
#cmakedefine HAVE_LIBZ 1
#cmakedefine HAVE_LINUX_JOYSTICK_H 1
#cmakedefine HAVE_STDLIB_H 1
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-06-17 01:09:01 UTC
(rev 6606)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-06-17 01:23:36 UTC
(rev 6607)
@@ -40,63 +40,65 @@
ADD_CUSTOM_COMMAND (OUTPUT ${playerxdr_h} ${playerxdr_c}
COMMAND ${PYTHON_EXECUTABLE}
${PROJECT_SOURCE_DIR}/libplayerxdr/playerxdrgen.py -distro
${CMAKE_CURRENT_SOURCE_DIR}/player.h ${playerxdr_c} ${playerxdr_h}
${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${interfaceFiles} ${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h
-)
+ DEPENDS ${interfaceFiles} ${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h)
# Include from the binary dir to get player_interfaces.h and interface_table.h
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
+SET (playercoreSrcs driver.cc
+ device.cc
+ drivertable.cc
+ devicetable.cc
+ configfile.cc
+ filewatcher.cc
+ message.cc
+ wallclocktime.cc
+ plugins.cc
+ globals.cc
+ property.cpp)
+
# TODO: playerxdr should NOT be linked here; it's a bogus dependency coming
# from the fact that message cloning functions are auto-generated into
# playerxdr and used here. Those functions should go into a separate
# library.
-SET(playercore_srcs driver.cc
- device.cc
- drivertable.cc
- devicetable.cc
- configfile.cc
- filewatcher.cc
- message.cc
- wallclocktime.cc
- plugins.cc
- globals.cc
- property.cpp)
-SET(CORELIBS playerutils playererror playerxdr pthread)
-SET(CORE_PC_LIBS "-lpthread")
+SET (coreLibs playerutils playererror playerxdr pthread)
+SET (corePCLibs "-lpthread")
PLAYER_ADD_LINK_LIB (pthread)
-IF(HAVE_CLOCK_GETTIME)
- SET(CORELIBS ${CORELIBS} rt)
- SET(CORE_PC_LIBS "${CORE_PC_LIBS} -lrt")
+IF (HAVE_CLOCK_GETTIME)
+ SET (coreLibs ${coreLibs} rt)
+ SET (corePCLibs "${corePCLibs} -lrt")
PLAYER_ADD_LINK_LIB (rt)
-ELSE(HAVE_CLOCK_GETTIME)
- SET(playercore_srcs ${playercore_srcs} ../replace/clock_gettime.c)
-ENDIF(HAVE_CLOCK_GETTIME)
-IF(HAVE_LIBLTDL)
- SET(CORELIBS ${CORELIBS} ltdl dl)
- SET(CORE_PC_LIBS "${CORE_PC_LIBS} -lltdl -dl")
+ELSE (HAVE_CLOCK_GETTIME)
+ SET (playercoreSrcs ${playercoreSrcs}
${PROJECT_SOURCE_DIR}/replace/clock_gettime.c)
+ENDIF (HAVE_CLOCK_GETTIME)
+IF (HAVE_LIBLTDL)
+ SET (coreLibs ${coreLibs} ltdl dl)
+ SET (corePCLibs "${corePCLibs} -lltdl -dl")
PLAYER_ADD_LINK_LIB (ltdl dl)
-ENDIF(HAVE_LIBLTDL)
-IF(NOT HAVE_DIRNAME)
- SET(playercore_srcs ${playercore_srcs} ../replace/dirname.c)
-ENDIF(NOT HAVE_DIRNAME)
+ENDIF (HAVE_LIBLTDL)
+IF (NOT HAVE_DIRNAME)
+ SET (playercoreSrcs ${playercoreSrcs}
${PROJECT_SOURCE_DIR}/replace/dirname.c)
+ENDIF (NOT HAVE_DIRNAME)
-PLAYER_ADD_LIBRARY (playercore ${playercore_srcs} ${player_interfaces_h}
${playerxdr_h})
+PLAYER_ADD_LIBRARY (playercore ${playercoreSrcs} ${player_interfaces_h}
${playerxdr_h})
+TARGET_LINK_LIBRARIES (playercore ${coreLibs})
+PLAYER_MAKE_PKGCONFIG ("playercore" "Player core library - part of the Player
Project"
+ "playererror" "" "" "${corePCLibs}")
-TARGET_LINK_LIBRARIES(playercore ${CORELIBS})
-PLAYER_MAKE_PKGCONFIG ("playercore" "Player core library - part of the Player
Project" "playererror" "" "" "${CORE_PC_LIBS}")
+SET (playererrorSrcs error.c)
+PLAYER_ADD_LIBRARY (playererror ${playererrorSrcs})
+PLAYER_MAKE_PKGCONFIG ("playererror" "Player error reporting library - part of
the Player Project"
+ "" "" "" "")
-SET (playererror_srcs error.c)
-PLAYER_ADD_LIBRARY (playererror ${playererror_srcs})
-PLAYER_MAKE_PKGCONFIG ("playererror" "Player error reporting library - part of
the Player Project" "" "" "" "")
-
-SET (playerutils_srcs interface_util.c
- addr_util.c)
-PLAYER_ADD_LIBRARY (playerutils ${playerutils_srcs} ${interface_table_h})
+SET (playerutilsSrcs interface_util.c
+ addr_util.c)
+PLAYER_ADD_LIBRARY (playerutils ${playerutilsSrcs} ${interface_table_h})
TARGET_LINK_LIBRARIES (playerutils playererror)
-PLAYER_MAKE_PKGCONFIG ("playerutils" "Player utilities library - part of the
Player Project" "" "" "" "")
+PLAYER_MAKE_PKGCONFIG ("playerutils" "Player utilities library - part of the
Player Project"
+ "" "" "" "")
PLAYER_INSTALL_HEADERS (playercore addr_util.h
configfile.h
Modified: code/player/trunk/libplayertcp/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayertcp/CMakeLists.txt 2008-06-17 01:09:01 UTC
(rev 6606)
+++ code/player/trunk/libplayertcp/CMakeLists.txt 2008-06-17 01:23:36 UTC
(rev 6607)
@@ -7,12 +7,12 @@
OPTION (ENABLE_TCP_NODELAY "Turn off Nagel's buffering algorithm (which
may increase socket latency when used)" OFF)
SET (playertcpSrcs socket_util.c playertcp.cc remote_driver.cc)
- IF(NOT HAVE_POLL)
- SET(playertcpSrcs ${playertcpSrcs} ../replace/poll.c)
- ENDIF(NOT HAVE_POLL)
- IF(NOT HAVE_COMPRESSBOUND)
- SET(playertcpSrcs ${playertcpSrcs} ../replace/compressBound.c)
- ENDIF(NOT HAVE_COMPRESSBOUND)
+ IF (NOT HAVE_POLL)
+ SET (playertcpSrcs ${playertcpSrcs} ${PROJECT_SOURCE_DIR}/replace/poll.c)
+ ENDIF (NOT HAVE_POLL)
+ IF (NOT HAVE_COMPRESSBOUND)
+ SET (playertcpSrcs ${playertcpSrcs}
${PROJECT_SOURCE_DIR}/replace/compressBound.c)
+ ENDIF (NOT HAVE_COMPRESSBOUND)
PLAYER_ADD_LIBRARY (playertcp ${playertcpSrcs})
TARGET_LINK_LIBRARIES (playertcp playercore playererror playerutils
playerxdr)
IF (HAVE_Z)
@@ -26,12 +26,12 @@
IF (INCLUDE_UDP)
SET (playerudpSrcs playerudp.cc)
- IF(NOT HAVE_POLL)
- SET(playerudpSrcs ${playerudpSrcs} ../replace/poll.c)
- ENDIF(NOT HAVE_POLL)
- IF(NOT HAVE_COMPRESSBOUND)
- SET(playerudpSrcs ${playerudpSrcs} ../replace/compressBound.c)
- ENDIF(NOT HAVE_COMPRESSBOUND)
+ IF (NOT HAVE_POLL)
+ SET(playerudpSrcs ${playerudpSrcs} ${PROJECT_SOURCE_DIR}/replace/poll.c)
+ ENDIF (NOT HAVE_POLL)
+ IF (NOT HAVE_COMPRESSBOUND)
+ SET (playerudpSrcs ${playerudpSrcs}
${PROJECT_SOURCE_DIR}/replace/compressBound.c)
+ ENDIF (NOT HAVE_COMPRESSBOUND)
PLAYER_ADD_LIBRARY (playerudp ${playerudpSrcs})
TARGET_LINK_LIBRARIES (playerudp playercore playererror playerutils
playerxdr)
TARGET_LINK_LIBRARIES (playerudp z)
Modified: code/player/trunk/replace/clock_gettime.c
===================================================================
--- code/player/trunk/replace/clock_gettime.c 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/replace/clock_gettime.c 2008-06-17 01:23:36 UTC (rev
6607)
@@ -20,9 +20,6 @@
*
*/
-#include <playerconfig.h>
-
-
#include <sys/time.h>
/* This replacement function originally written by Klass Gadeyne
Modified: code/player/trunk/server/libplayerdrivers/CMakeLists.txt
===================================================================
--- code/player/trunk/server/libplayerdrivers/CMakeLists.txt 2008-06-17
01:09:01 UTC (rev 6606)
+++ code/player/trunk/server/libplayerdrivers/CMakeLists.txt 2008-06-17
01:23:36 UTC (rev 6607)
@@ -37,12 +37,12 @@
LIST (APPEND allSourceNames ${PLAYER_BUILT_DRIVEREXTRAS})
ENDIF (PLAYER_BUILT_DRIVEREXTRAS)
MAP_TO_LIST (driversSrcs "${allSourceNames}" PLAYER_DRIVERSLIB_SOURCES_MAP)
-IF(NOT HAVE_CFMAKERAW)
- LIST(APPEND driversSrcs ../../replace/cfmakeraw.c)
-ENDIF(NOT HAVE_CFMAKERAW)
-IF(NOT HAVE_ROUND)
- LIST(APPEND driversSrcs ../../replace/round.c)
-ENDIF(NOT HAVE_ROUND)
+IF (NOT HAVE_CFMAKERAW)
+ LIST (APPEND driversSrcs ${PROJECT_SOURCE_DIR}/replace/cfmakeraw.c)
+ENDIF (NOT HAVE_CFMAKERAW)
+IF (NOT HAVE_ROUND)
+ LIST (APPEND driversSrcs ${PROJECT_SOURCE_DIR}/replace/round.c)
+ENDIF (NOT HAVE_ROUND)
FILTER_DUPLICATES (driversSrcs "${driversSrcs}")
# MESSAGE (STATUS "Sources is ${driversSrcs}")
Modified: code/player/trunk/utils/pmap/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/pmap/CMakeLists.txt 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/utils/pmap/CMakeLists.txt 2008-06-17 01:23:36 UTC (rev
6607)
@@ -10,19 +10,36 @@
LIST_TO_STRING (GSL_CFLAGS "${GSL_PKG_CFLAGS}")
LIST_TO_STRING (GSL_LDFLAGS "${GSL_PKG_LDFLAGS}")
- SET (pmapSrcs logfile.cpp omap.cpp pmap.cpp rmap.cpp slap.cpp)
- SET (lodoSrcs lodo.cpp slap.cpp)
- SET (pmaptestSrcs pmap_test.cpp)
+ INCLUDE (FindOpenGL)
+ INCLUDE (FindGLUT)
+
+ SET (pmapconfig_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pmapconfig.h.in")
+ SET (pmapconfig_h "${CMAKE_CURRENT_BINARY_DIR}/pmapconfig.h")
+ CONFIGURE_FILE (${pmapconfig_h_in} ${pmapconfig_h})
+
+ SET (pmapSrcs logfile.cpp omap.cpp pmap.cpp rmap.cpp slap.cpp
${pmapconfig_h})
+ SET (lodoSrcs lodo.cpp slap.cpp ${pmapconfig_h})
+ SET (pmaptestSrcs pmap_test.cpp ${pmapconfig_h})
SET (lododriverSrcs lodo_driver.cc)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
+ ${CMAKE_CURRENT_BINARY_DIR})
+ IF (GLUT_FOUND)
+ INCLUDE_DIRECTORIES (${GLUT_INCLUDE_DIR})
+ ENDIF (GLUT_FOUND)
PLAYER_ADD_EXECUTABLE (pmaptest ${pmaptestSrcs})
TARGET_LINK_LIBRARIES (pmaptest pmap lodo)
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (pmaptest ${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})
+ ENDIF (GLUT_FOUND)
SET_SOURCE_FILES_PROPERTIES (${pmapSrcs} PROPERTIES
COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
SET_TARGET_PROPERTIES (pmap PROPERTIES
@@ -30,6 +47,9 @@
PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
TARGET_LINK_LIBRARIES (lodo playercore)
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (lodo ${GLUT_LIBRARIES})
+ ENDIF (GLUT_FOUND)
SET_SOURCE_FILES_PROPERTIES (${lodoSrcs} PROPERTIES
COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
SET_TARGET_PROPERTIES (lodo PROPERTIES
@@ -37,6 +57,9 @@
PLAYER_ADD_LIBRARY (lododriver ${lododriverSrcs})
TARGET_LINK_LIBRARIES (lododriver lodo)
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (lododriver ${GLUT_LIBRARIES})
+ ENDIF (GLUT_FOUND)
ELSE (GSL_PKG_FOUND)
MESSAGE (STATUS "pmap utilities will not be built - GSL not found")
ENDIF (GSL_PKG_FOUND)
Modified: code/player/trunk/utils/pmap/lodo.cpp
===================================================================
--- code/player/trunk/utils/pmap/lodo.cpp 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/utils/pmap/lodo.cpp 2008-06-17 01:23:36 UTC (rev
6607)
@@ -24,7 +24,7 @@
CVS: $Id$
*/
-#include "config.h"
+#include "pmapconfig.h"
#include <assert.h>
#include <math.h>
@@ -37,7 +37,7 @@
#include "lodo.h"
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
#include <GL/glut.h>
#endif
@@ -676,7 +676,7 @@
// Draw a scan
void lodo_draw_scan(lodo_t *self, lodo_scan_t *scan)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i;
vector2_t p;
@@ -713,7 +713,7 @@
// Draw current map (hits)
void lodo_draw_map(lodo_t *self)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i;
vector3_t p;
Modified: code/player/trunk/utils/pmap/omap.cpp
===================================================================
--- code/player/trunk/utils/pmap/omap.cpp 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/utils/pmap/omap.cpp 2008-06-17 01:23:36 UTC (rev
6607)
@@ -24,7 +24,7 @@
*/
-#include "config.h"
+#include "pmapconfig.h"
#include <assert.h>
#include <errno.h>
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
#include <GL/glut.h>
#endif
@@ -205,7 +205,7 @@
// Draw the current map
void omap_draw_map(omap_t *self, double scale)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i, j;
// Set pixel zoom factor so DrawPixel ops align
Modified: code/player/trunk/utils/pmap/pmap.cpp
===================================================================
--- code/player/trunk/utils/pmap/pmap.cpp 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/utils/pmap/pmap.cpp 2008-06-17 01:23:36 UTC (rev
6607)
@@ -22,7 +22,7 @@
Date: 19 Nov 2004
CVS: $Id$
*/
-#include "config.h"
+#include "pmapconfig.h"
#include <assert.h>
#include <math.h>
@@ -32,7 +32,7 @@
#include <string.h>
#include <gsl/gsl_randist.h>
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
#include <GL/glut.h>
#endif
@@ -574,7 +574,7 @@
// Draw the current range scan
void pmap_draw_scan(pmap_t *self, double *ranges)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i, best_i;
double max_w;
vector2_t p;
@@ -634,7 +634,7 @@
// Draw all samples
void pmap_draw_samples(pmap_t *self)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i;
pmap_sample_t *sample;
@@ -658,7 +658,7 @@
// Draw a particular sample
void pmap_draw_sample(pmap_t *self, int sample_index)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i;
pmap_sample_t *sample;
pose2_t pose;
@@ -683,7 +683,7 @@
// Draw a candidate map
void pmap_draw_map(pmap_t *self, double scale)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
pmap_draw_sample_map(self, scale, self->best_sample);
return;
#endif
@@ -693,7 +693,7 @@
// Draw a particular sample map
void pmap_draw_sample_map(pmap_t *self, double scale, int sample_index)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i, j;
pmap_sample_t *sample;
Modified: code/player/trunk/utils/pmap/pmap_test.cpp
===================================================================
--- code/player/trunk/utils/pmap/pmap_test.cpp 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/utils/pmap/pmap_test.cpp 2008-06-17 01:23:36 UTC (rev
6607)
@@ -144,7 +144,7 @@
@endverbatim
*/
-#include "config.h"
+#include "pmapconfig.h"
#include <assert.h>
#include <math.h>
@@ -156,7 +156,7 @@
#include <unistd.h>
#include <sys/time.h>
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
#include <GL/glut.h>
#endif
@@ -277,7 +277,7 @@
// Key callback
void win_key(unsigned char key, int x, int y)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
// Show the samples
if (key == 'T' || key == 't')
{
@@ -339,7 +339,7 @@
// Mouse callback
void win_mouse(int button, int state, int x, int y)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
if (state == GLUT_DOWN)
{
@@ -360,7 +360,7 @@
// Handle window reshape events
void win_reshape(int width, int height)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
glViewport(0, 0, width, height);
viewport_width = width;
@@ -373,7 +373,7 @@
// Redraw the window
void win_redraw()
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
double left, right, top, bot;
@@ -440,7 +440,7 @@
if (!gui_pause)
{
process();
- #ifdef HAVE_LIBGLUT
+ #ifdef GLUT_FOUND
glutPostRedisplay();
#endif
}
@@ -454,7 +454,7 @@
// Run the GUI
int win_run(int *argc, char **argv)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
glutInit(argc, argv);
Modified: code/player/trunk/utils/pmap/rmap.cpp
===================================================================
--- code/player/trunk/utils/pmap/rmap.cpp 2008-06-17 01:09:01 UTC (rev
6606)
+++ code/player/trunk/utils/pmap/rmap.cpp 2008-06-17 01:23:36 UTC (rev
6607)
@@ -31,9 +31,9 @@
#include <gsl/gsl_multimin.h>
-#include <config.h>
+#include "pmapconfig.h"
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
#include <GL/glut.h>
#endif
@@ -572,7 +572,7 @@
// Draw the current map
void rmap_draw_map(rmap_t *self)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i, j;
rmap_scan_t *scan;
vector2_t p;
@@ -609,7 +609,7 @@
// Draw constraints
void rmap_draw_cons(rmap_t *self)
{
-#ifdef HAVE_LIBGLUT
+#ifdef GLUT_FOUND
int i;
rmap_constraint_t *con;
vector2_t pa, pb;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
