Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14549/libstage
Modified Files:
Makefile Makefile.am TODO
Log Message:
added controller directory in examples
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile 22 Feb 2008 20:33:48 -0000 1.11
--- Makefile 22 Feb 2008 21:20:47 -0000 1.12
***************
*** 74,83 ****
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libstage_la_LDFLAGS) $(LDFLAGS) -o $@
- wander_la_LIBADD =
- am_wander_la_OBJECTS = ctrl.lo
- wander_la_OBJECTS = $(am_wander_la_OBJECTS)
- wander_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(wander_la_LDFLAGS) $(LDFLAGS) -o $@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
--- 74,77 ----
***************
*** 105,111 ****
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
! SOURCES = $(libstage_la_SOURCES) $(wander_la_SOURCES) $(stage_SOURCES)
! DIST_SOURCES = $(libstage_la_SOURCES) $(wander_la_SOURCES) \
! $(stage_SOURCES)
pkgdataDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgdata_DATA)
--- 99,104 ----
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
! SOURCES = $(libstage_la_SOURCES) $(stage_SOURCES)
! DIST_SOURCES = $(libstage_la_SOURCES) $(stage_SOURCES)
pkgdataDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgdata_DATA)
***************
*** 247,254 ****
AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/opt/local/include/gtk-2.0
-I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include
-I/opt/local/include -I/opt/local/include -I/opt/local/include/FL/images
-DRGBFILE=\"$(RGB)\"
! # build the stage library
! lib_LTLIBRARIES = libstage.la wander.la
!
! # The stage library
libstage_la_SOURCES = \
../config.h \
--- 240,245 ----
AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/opt/local/include/gtk-2.0
-I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include
-I/opt/local/include -I/opt/local/include -I/opt/local/include/FL/images
-DRGBFILE=\"$(RGB)\"
! # build the stage library and program
! lib_LTLIBRARIES = libstage.la
libstage_la_SOURCES = \
../config.h \
***************
*** 256,260 ****
block.cc \
canvas.cc \
- colors.h \
gl.cc \
glcolorstack.cc \
--- 247,250 ----
***************
*** 279,289 ****
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_images
-lfltk_png -lz -lfltk_jpeg -lfltk_gl -framework AGL -framework OpenGL -lfltk
-framework Carbon -framework ApplicationServices -lltdl
stage_DEPENDENCIES = libstage.la
stage_SOURCES = main.cc
stage_LDADD = libstage.la
-
- # WANDER CONTROLLER
- wander_la_SOURCES = ctrl.cc stage.hh
- wander_la_LDFLAGS = -module
all: all-am
--- 269,277 ----
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_images
-lfltk_png -lz -lfltk_jpeg -lfltk_gl -framework AGL -framework OpenGL -lfltk
-framework Carbon -framework ApplicationServices -lltdl
+
+ # STAGE
stage_DEPENDENCIES = libstage.la
stage_SOURCES = main.cc
stage_LDADD = libstage.la
all: all-am
***************
*** 348,353 ****
libstage.la: $(libstage_la_OBJECTS) $(libstage_la_DEPENDENCIES)
$(libstage_la_LINK) -rpath $(libdir) $(libstage_la_OBJECTS)
$(libstage_la_LIBADD) $(LIBS)
- wander.la: $(wander_la_OBJECTS) $(wander_la_DEPENDENCIES)
- $(wander_la_LINK) -rpath $(libdir) $(wander_la_OBJECTS)
$(wander_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
--- 336,339 ----
***************
*** 391,395 ****
include ./$(DEPDIR)/block.Plo
include ./$(DEPDIR)/canvas.Plo
- include ./$(DEPDIR)/ctrl.Plo
include ./$(DEPDIR)/gl.Plo
include ./$(DEPDIR)/glcolorstack.Plo
--- 377,380 ----
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am 22 Feb 2008 20:33:48 -0000 1.5
--- Makefile.am 22 Feb 2008 21:20:47 -0000 1.6
***************
*** 16,23 ****
AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace @PIXBUF_CFLAGS@
@FLTK_CFLAGS@ -DRGBFILE=\"$(RGB)\"
! # build the stage library
! lib_LTLIBRARIES = libstage.la wander.la
- # The stage library
libstage_la_SOURCES = \
../config.h \
--- 16,23 ----
AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace @PIXBUF_CFLAGS@
@FLTK_CFLAGS@ -DRGBFILE=\"$(RGB)\"
! # build the stage library and program
! lib_LTLIBRARIES = libstage.la
! bin_PROGRAMS = stage
libstage_la_SOURCES = \
../config.h \
***************
*** 25,29 ****
block.cc \
canvas.cc \
- colors.h \
gl.cc \
glcolorstack.cc \
--- 25,28 ----
***************
*** 50,60 ****
# STAGE
- bin_PROGRAMS = stage
stage_DEPENDENCIES = libstage.la
stage_SOURCES = main.cc
stage_LDADD = libstage.la
- # WANDER CONTROLLER
- wander_la_SOURCES = ctrl.cc stage.hh
- wander_la_LDFLAGS = -module
-
--- 49,54 ----
Index: TODO
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TODO 21 Feb 2008 23:40:13 -0000 1.3
--- TODO 22 Feb 2008 21:20:47 -0000 1.4
***************
*** 1,8 ****
! ** 3.0 RELEASE **
BUGS
* saving worldfile adds newlines after includes
* Viewing About Box stops simulation
* [OSX only - FLTK bug?] loading window size constrains maximum window size
--- 1,9 ----
! ** 3.0.0 RELEASE **
BUGS
* saving worldfile adds newlines after includes
* Viewing About Box stops simulation
+ * 3d collision detection broken - e.g. fancypioneer2dx
* [OSX only - FLTK bug?] loading window size constrains maximum window size
***************
*** 14,17 ****
--- 15,20 ----
DESIRABLE FEATURES
* energy model & recharging
+ * runtime update rate UI
+
** FUTURE RELEASES **
\ No newline at end of file
-------------------------------------------------------------------------
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
