Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11072/libstage
Modified Files:
Makefile gl.cc
Log Message:
fixed automake so builds without Player
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile 21 Feb 2008 20:10:40 -0000 1.9
--- Makefile 21 Feb 2008 23:55:29 -0000 1.10
***************
*** 144,151 ****
GREP = /bin/grep
HAVE_FLTK_CONFIG = fltk-config
! HAVE_PLAYERC_FALSE = #
! HAVE_PLAYERC_TRUE =
! HAVE_PLAYER_FALSE = #
! HAVE_PLAYER_TRUE =
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
--- 144,151 ----
GREP = /bin/grep
HAVE_FLTK_CONFIG = fltk-config
! HAVE_PLAYERC_FALSE =
! HAVE_PLAYERC_TRUE = #
! HAVE_PLAYER_FALSE =
! HAVE_PLAYER_TRUE = #
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
***************
*** 171,178 ****
PIXBUF_LIBS = -lgdk_pixbuf-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
PKG_CONFIG = /usr/bin/pkg-config
! PLAYERC_CFLAGS = -I/home/vaughan/PS-2.0/include/player-2.1
! PLAYERC_LIBS = -L/home/vaughan/PS-2.0/lib -lplayerc -lm -lplayerxdr
-lplayererror
! PLAYER_CFLAGS = -I/home/vaughan/PS-2.0/include/player-2.1
! PLAYER_LIBS = -L/home/vaughan/PS-2.0/lib -lplayercore -lltdl -lpthread
-lplayererror
RANLIB = ranlib
SED = /usr/bin/sed
--- 171,178 ----
PIXBUF_LIBS = -lgdk_pixbuf-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
PKG_CONFIG = /usr/bin/pkg-config
! PLAYERC_CFLAGS =
! PLAYERC_LIBS =
! PLAYER_CFLAGS =
! PLAYER_LIBS =
RANLIB = ranlib
SED = /usr/bin/sed
***************
*** 222,226 ****
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /home/vaughan/PS-2.0
program_transform_name = s,x,x,
psdir = ${docdir}
--- 222,226 ----
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /usr/local
program_transform_name = s,x,x,
psdir = ${docdir}
Index: gl.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/gl.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gl.cc 18 Feb 2008 03:52:30 -0000 1.1
--- gl.cc 21 Feb 2008 23:55:29 -0000 1.2
***************
*** 29,33 ****
glBegin(GL_LINES);
! for( int i = floor(vol.x.min); i < vol.x.max; i++)
{
glVertex2f( i, vol.y.min );
--- 29,33 ----
glBegin(GL_LINES);
! for( double i = floor(vol.x.min); i < vol.x.max; i++)
{
glVertex2f( i, vol.y.min );
***************
*** 35,39 ****
}
! for( int i = floor(vol.y.min); i < vol.y.max; i++)
{
glVertex2f( vol.x.min, i );
--- 35,39 ----
}
! for( double i = floor(vol.y.min); i < vol.y.max; i++)
{
glVertex2f( vol.x.min, i );
***************
*** 45,49 ****
char str[16];
! for( int i = floor(vol.x.min); i < vol.x.max; i++)
{
snprintf( str, 16, "%d", (int)i );
--- 45,49 ----
char str[16];
! for( double i = floor(vol.x.min); i < vol.x.max; i++)
{
snprintf( str, 16, "%d", (int)i );
***************
*** 51,55 ****
}
! for( int i = floor(vol.y.min); i < vol.y.max; i++)
{
snprintf( str, 16, "%d", (int)i );
--- 51,55 ----
}
! for( double i = floor(vol.y.min); i < vol.y.max; i++)
{
snprintf( str, 16, "%d", (int)i );
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
