Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3531
Modified Files:
Tag: opengl
Makefile Makefile.am
Removed Files:
Tag: opengl
stage.c
Log Message:
renamed stage.c to stage.cc
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/Makefile,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** Makefile 22 Nov 2007 01:36:46 -0000 1.1.2.5
--- Makefile 22 Nov 2007 01:39:04 -0000 1.1.2.6
***************
*** 20,26 ****
# $Id$
- # also build Zoo referees
- #SUBDIRS = referees
-
--- 20,23 ----
***************
*** 117,121 ****
AUTOMAKE = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
automake-1.10
AWK = gawk
! CC = g++
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
--- 114,118 ----
AUTOMAKE = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
automake-1.10
AWK = gawk
! CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
***************
*** 235,238 ****
--- 232,237 ----
# install the color database
pkgdata_DATA = rgb.txt
+
+ # CC=g++
RGB = $(datadir)/stage/rgb.txt
***************
*** 243,252 ****
lib_LTLIBRARIES = libstage.la
! # The stage library contains everything you need to build a robot
! # simulation, including graphics and a world description file
! # parser. It does NOT contain a Player interface, so it can not be
! # used as a player plugin. See libstageplugin (below) for good Player
! # satisfaction.
! #
libstage_la_SOURCES = \
../config.h \
--- 242,246 ----
lib_LTLIBRARIES = libstage.la
! # The stage library
libstage_la_SOURCES = \
../config.h \
***************
*** 273,287 ****
! # logo.cc
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
libstage_la_LIBADD = -L/opt/local/lib -lgdk_pixbuf-2.0 -lgobject-2.0
-lgmodule-2.0 -lglib-2.0 -lintl -liconv -L/opt/local/lib -lfltk_gl -framework
AGL -framework OpenGL -lfltk -framework Carbon -framework ApplicationServices
- # TODO fix these and move them to a separate tree?
- #zoo.c
- #zoo_driver.cc
- #zoo_species.cc
- #zoo_controller.cc
- #zoo_referee.cc
-
# build a stand-alone test program using libstage
stest_DEPENDENCIES = libstage.la
--- 267,274 ----
! #logo.cc
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
libstage_la_LIBADD = -L/opt/local/lib -lgdk_pixbuf-2.0 -lgobject-2.0
-lgmodule-2.0 -lglib-2.0 -lintl -liconv -L/opt/local/lib -lfltk_gl -framework
AGL -framework OpenGL -lfltk -framework Carbon -framework ApplicationServices
# build a stand-alone test program using libstage
stest_DEPENDENCIES = libstage.la
***************
*** 675,679 ****
uninstall-pkgdataDATA
- #stest_LDFLAGS =
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- 662,665 ----
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/Makefile.am,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** Makefile.am 22 Nov 2007 01:36:46 -0000 1.1.2.4
--- Makefile.am 22 Nov 2007 01:39:04 -0000 1.1.2.5
***************
*** 11,16 ****
pkgdata_DATA = rgb.txt
- # CC=g++
-
RGB=$(datadir)/@PACKAGE@/rgb.txt
--- 11,14 ----
***************
*** 41,45 ****
model_ranger.cc \
model_props.cc \
! stage.c \
stage.hh \
typetable.cc \
--- 39,43 ----
model_ranger.cc \
model_props.cc \
! stage.cc \
stage.hh \
typetable.cc \
--- stage.c DELETED ---
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
