Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16227/libstage
Modified Files:
Tag: opengl
Makefile model_laser.cc model_load.cc world.cc
Log Message:
added debug member to models
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/Makefile,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Makefile 12 Oct 2007 00:41:54 -0000 1.1.2.3
--- Makefile 22 Oct 2007 02:36:33 -0000 1.1.2.4
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.9.4 from Makefile.am.
# libstage/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10 from Makefile.am.
# libstage/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 26,40 ****
- SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
-
- srcdir = .
- top_srcdir = ..
pkgdatadir = $(datadir)/stage
pkglibdir = $(libdir)/stage
pkgincludedir = $(includedir)/stage
- top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
--- 26,34 ----
***************
*** 48,54 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i686-apple-darwin8.10.1
! host_triplet = i686-apple-darwin8.10.1
! target_triplet = i686-apple-darwin8.10.1
bin_PROGRAMS = stest$(EXEEXT)
subdir = libstage
--- 42,48 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i386-apple-darwin8.10.1
! host_triplet = i386-apple-darwin8.10.1
! target_triplet = i386-apple-darwin8.10.1
bin_PROGRAMS = stest$(EXEEXT)
subdir = libstage
***************
*** 79,105 ****
typetable.lo world.lo worldfile.lo worldgtk.lo
libstage_la_OBJECTS = $(am_libstage_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_stest_OBJECTS = stest.$(OBJEXT)
stest_OBJECTS = $(am_stest_OBJECTS)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
! $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
! $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
! CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
! $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
DIST_SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
--- 73,104 ----
typetable.lo world.lo worldfile.lo worldgtk.lo
libstage_la_OBJECTS = $(am_libstage_la_OBJECTS)
+ libstage_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(libstage_la_LDFLAGS) $(LDFLAGS) -o $@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_stest_OBJECTS = stest.$(OBJEXT)
stest_OBJECTS = $(am_stest_OBJECTS)
! DEFAULT_INCLUDES = -I. -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
! --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
! --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
! $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
! --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
! CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
! --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
! $(LDFLAGS) -o $@
SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
DIST_SOURCES = $(libstage_la_SOURCES) $(stest_SOURCES)
***************
*** 111,123 ****
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! ACLOCAL = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
aclocal-1.9
! AMDEP_FALSE = #
! AMDEP_TRUE =
AMTAR = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run tar
AR = ar
AUTOCONF = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run autoconf
AUTOHEADER = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
autoheader
! AUTOMAKE = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
automake-1.9
! AWK = awk
CC = g++
CCDEPMODE = depmode=gcc3
--- 110,120 ----
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! ACLOCAL = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
aclocal-1.10
AMTAR = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run tar
AR = ar
AUTOCONF = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run autoconf
AUTOHEADER = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
autoheader
! AUTOMAKE = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run
automake-1.10
! AWK = gawk
CC = g++
CCDEPMODE = depmode=gcc3
***************
*** 136,151 ****
ECHO_N = -n
ECHO_T =
! EGREP = grep -E
EXEEXT =
F77 =
FFLAGS =
! GUI_CFLAGS = -I/sw/include/gtkglext-1.0 -I/sw/lib/gtkglext-1.0/include
-I/usr/X11R6/include -I/sw/include/gtk-2.0 -I/sw/lib/gtk-2.0/include
-I/sw/include/pango-1.0 -I/usr/X11R6/include/freetype2 -I/sw/include/glib-2.0
-I/sw/lib/glib-2.0/include -I/sw/include/atk-1.0
! GUI_LIBS = -L/sw/lib -L/usr/X11R6/lib -lgtkglext-x11-1.0 -lgdkglext-x11-1.0
-lGLU -lGL -lXmu -lXt -lSM -lICE -lgtk-x11-2.0 -lgdk-x11-2.0 -lXrandr
-lXinerama -lXext -lXcursor -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 -lXft
-lXrender -lpangox-1.0 -lX11 -lpangoft2-1.0 -lfontconfig -lfreetype -lpango-1.0
-lm -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv
! HAVE_PLAYER_FALSE = #
! HAVE_PLAYER_TRUE =
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
LDFLAGS =
LIBOBJS =
--- 133,148 ----
ECHO_N = -n
ECHO_T =
! EGREP = /usr/bin/grep -E
EXEEXT =
F77 =
FFLAGS =
! GREP = /usr/bin/grep
! GUI_CFLAGS = -DXTHREADS -I/opt/local/include/gtkglext-1.0
-I/opt/local/lib/gtkglext-1.0/include -I/usr/X11R6/include
-I/opt/local/include/gtk-2.0 -I/opt/local/lib/gtk-2.0/include
-I/opt/local/include/pango-1.0 -I/opt/local/include/glib-2.0
-I/opt/local/lib/glib-2.0/include -I/opt/local/include
-I/opt/local/include/cairo -I/opt/local/include/freetype2
-I/opt/local/include/libpng12 -I/opt/local/include/atk-1.0
! GUI_LIBS = -L/opt/local/lib -L/usr/X11R6/lib -lgtkglext-x11-1.0
-lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lgtk-x11-2.0 -lpangox-1.0
-lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -ltiff -ljpeg -lm -lpangocairo-1.0
-lpango-1.0 -lcairo -lSM -lICE -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl
-liconv -lfreetype -lz -lfontconfig -lexpat -lpng12 -lXrender -lX11
! INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LDFLAGS =
LIBOBJS =
***************
*** 156,159 ****
--- 153,157 ----
LTLIBOBJS =
MAKEINFO = ${SHELL} /Users/vaughan/PS/HEAD/stage.opengl/missing --run makeinfo
+ MKDIR_P = .././install-sh -c -d
OBJEXT = o
PACKAGE = stage
***************
*** 164,168 ****
PACKAGE_VERSION = 3.0.0
PATH_SEPARATOR = :
! PKG_CONFIG = /sw/bin/pkg-config
PLAYER_CFLAGS = -I/Users/vaughan/PS-2.0/include/player-2.0
PLAYER_LIBS = -L/Users/vaughan/PS-2.0/lib -lplayercore -lltdl -lpthread
-lplayererror
--- 162,166 ----
PACKAGE_VERSION = 3.0.0
PATH_SEPARATOR = :
! PKG_CONFIG = /opt/local/bin/pkg-config
PLAYER_CFLAGS = -I/Users/vaughan/PS-2.0/include/player-2.0
PLAYER_LIBS = -L/Users/vaughan/PS-2.0/lib -lplayercore -lltdl -lpthread
-lplayererror
***************
*** 172,185 ****
STRIP = strip
VERSION = 3.0.0
! ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_F77 =
- ac_ct_RANLIB = ranlib
- ac_ct_STRIP = strip
- am__fastdepCC_FALSE = #
- am__fastdepCC_TRUE =
- am__fastdepCXX_FALSE = #
- am__fastdepCXX_TRUE =
am__include = include
am__leading_dot = .
--- 170,180 ----
STRIP = strip
VERSION = 3.0.0
! abs_builddir = /Users/vaughan/PS/HEAD/stage.opengl/libstage
! abs_srcdir = /Users/vaughan/PS/HEAD/stage.opengl/libstage
! abs_top_builddir = /Users/vaughan/PS/HEAD/stage.opengl
! abs_top_srcdir = /Users/vaughan/PS/HEAD/stage.opengl
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_F77 =
am__include = include
am__leading_dot = .
***************
*** 188,223 ****
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i686-apple-darwin8.10.1
build_alias =
! build_cpu = i686
build_os = darwin8.10.1
build_vendor = apple
! datadir = ${prefix}/share
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i686-apple-darwin8.10.1
host_alias =
! host_cpu = i686
host_os = darwin8.10.1
host_vendor = apple
includedir = ${prefix}/include
! infodir = ${prefix}/info
! install_sh = /Users/vaughan/PS/HEAD/stage.opengl/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
! mandir = ${prefix}/man
! mkdir_p = $(install_sh) -d
oldincludedir = /usr/include
prefix = /Users/vaughan/PS-2.0
program_transform_name = s,x,x,
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
! target = i686-apple-darwin8.10.1
target_alias =
! target_cpu = i686
target_os = darwin8.10.1
target_vendor = apple
# install the header file for the Stage library
--- 183,229 ----
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i386-apple-darwin8.10.1
build_alias =
! build_cpu = i386
build_os = darwin8.10.1
build_vendor = apple
! builddir = .
! datadir = ${datarootdir}
! datarootdir = ${prefix}/share
! docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
! dvidir = ${docdir}
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i386-apple-darwin8.10.1
host_alias =
! host_cpu = i386
host_os = darwin8.10.1
host_vendor = apple
+ htmldir = ${docdir}
includedir = ${prefix}/include
! infodir = ${datarootdir}/info
! install_sh = $(SHELL) /Users/vaughan/PS/HEAD/stage.opengl/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
+ localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
! mandir = ${datarootdir}/man
! mkdir_p = $(top_builddir)/./install-sh -c -d
oldincludedir = /usr/include
+ pdfdir = ${docdir}
prefix = /Users/vaughan/PS-2.0
program_transform_name = s,x,x,
+ psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
+ srcdir = .
sysconfdir = ${prefix}/etc
! target = i386-apple-darwin8.10.1
target_alias =
! target_cpu = i386
target_os = darwin8.10.1
target_vendor = apple
+ top_builddir = ..
+ top_srcdir = ..
# install the header file for the Stage library
***************
*** 229,234 ****
# system-wide compile flags - target-specific flags are added to each target
below
! #AM_CFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/sw/include/gtkglext-1.0
-I/sw/lib/gtkglext-1.0/include -I/usr/X11R6/include -I/sw/include/gtk-2.0
-I/sw/lib/gtk-2.0/include -I/sw/include/pango-1.0
-I/usr/X11R6/include/freetype2 -I/sw/include/glib-2.0
-I/sw/lib/glib-2.0/include -I/sw/include/atk-1.0 -std=c99
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/sw/include/gtkglext-1.0
-I/sw/lib/gtkglext-1.0/include -I/usr/X11R6/include -I/sw/include/gtk-2.0
-I/sw/lib/gtk-2.0/include -I/sw/include/pango-1.0
-I/usr/X11R6/include/freetype2 -I/sw/include/glib-2.0
-I/sw/lib/glib-2.0/include -I/sw/include/atk-1.0 -DRGBFILE=\"$(RGB)\"
# build the stage library
--- 235,240 ----
# system-wide compile flags - target-specific flags are added to each target
below
! #AM_CFLAGS = -Wall -I. -I$(top_srcdir)/replace -DXTHREADS
-I/opt/local/include/gtkglext-1.0 -I/opt/local/lib/gtkglext-1.0/include
-I/usr/X11R6/include -I/opt/local/include/gtk-2.0
-I/opt/local/lib/gtk-2.0/include -I/opt/local/include/pango-1.0
-I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include
-I/opt/local/include -I/opt/local/include/cairo -I/opt/local/include/freetype2
-I/opt/local/include/libpng12 -I/opt/local/include/atk-1.0 -std=c99
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -DXTHREADS
-I/opt/local/include/gtkglext-1.0 -I/opt/local/lib/gtkglext-1.0/include
-I/usr/X11R6/include -I/opt/local/include/gtk-2.0
-I/opt/local/lib/gtk-2.0/include -I/opt/local/include/pango-1.0
-I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include
-I/opt/local/include -I/opt/local/include/cairo -I/opt/local/include/freetype2
-I/opt/local/include/libpng12 -I/opt/local/include/atk-1.0
-DRGBFILE=\"$(RGB)\"
# build the stage library
***************
*** 264,268 ****
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = -L/sw/lib -L/usr/X11R6/lib -lgtkglext-x11-1.0
-lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lSM -lICE -lgtk-x11-2.0 -lgdk-x11-2.0
-lXrandr -lXinerama -lXext -lXcursor -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0
-lXft -lXrender -lpangox-1.0 -lX11 -lpangoft2-1.0 -lfontconfig -lfreetype
-lpango-1.0 -lm -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv
# TODO fix these and move them to a separate tree?
--- 270,274 ----
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = -L/opt/local/lib -L/usr/X11R6/lib -lgtkglext-x11-1.0
-lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lgtk-x11-2.0 -lpangox-1.0
-lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -ltiff -ljpeg -lm -lpangocairo-1.0
-lpango-1.0 -lcairo -lSM -lICE -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl
-liconv -lfreetype -lz -lfontconfig -lexpat -lpng12 -lXrender -lX11
# TODO fix these and move them to a separate tree?
***************
*** 276,280 ****
stest_DEPENDENCIES = libstage.la
stest_SOURCES = stest.cc
! stest_LDADD = libstage.la -L/sw/lib -L/usr/X11R6/lib -lgtkglext-x11-1.0
-lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lSM -lICE -lgtk-x11-2.0 -lgdk-x11-2.0
-lXrandr -lXinerama -lXext -lXcursor -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0
-lXft -lXrender -lpangox-1.0 -lX11 -lpangoft2-1.0 -lfontconfig -lfreetype
-lpango-1.0 -lm -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv
all: all-am
--- 282,286 ----
stest_DEPENDENCIES = libstage.la
stest_SOURCES = stest.cc
! stest_LDADD = libstage.la -L/opt/local/lib -L/usr/X11R6/lib
-lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lgtk-x11-2.0
-lpangox-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -ltiff -ljpeg -lm
-lpangocairo-1.0 -lpango-1.0 -lcairo -lSM -lICE -lgobject-2.0 -lgmodule-2.0
-lglib-2.0 -lintl -liconv -lfreetype -lz -lfontconfig -lexpat -lpng12 -lXrender
-lX11
all: all-am
***************
*** 312,316 ****
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
! test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
--- 318,322 ----
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
! test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
***************
*** 323,327 ****
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--- 329,333 ----
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
***************
*** 338,345 ****
done
libstage.la: $(libstage_la_OBJECTS) $(libstage_la_DEPENDENCIES)
! $(CXXLINK) -rpath $(libdir) $(libstage_la_LDFLAGS)
$(libstage_la_OBJECTS) $(libstage_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
! test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
--- 344,351 ----
done
libstage.la: $(libstage_la_OBJECTS) $(libstage_la_DEPENDENCIES)
! $(libstage_la_LINK) -rpath $(libdir) $(libstage_la_OBJECTS)
$(libstage_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
! test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
***************
*** 369,373 ****
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES)
@rm -f stest$(EXEEXT)
! $(CXXLINK) $(stest_LDFLAGS) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)
mostlyclean-compile:
--- 375,379 ----
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES)
@rm -f stest$(EXEEXT)
! $(CXXLINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)
mostlyclean-compile:
***************
*** 396,401 ****
.c.o:
! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f
"$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--- 402,407 ----
.c.o:
! $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
! mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
***************
*** 403,408 ****
.c.obj:
! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@
`$(CYGPATH_W) '$<'`; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f
"$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--- 409,414 ----
.c.obj:
! $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W)
'$<'`
! mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
***************
*** 410,415 ****
.c.lo:
! if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f
"$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=yes \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--- 416,421 ----
.c.lo:
! $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
! mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
# source='$<' object='$@' libtool=yes \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
***************
*** 417,422 ****
.cc.o:
! if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f
"$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
--- 423,428 ----
.cc.o:
! $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
! mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
***************
*** 424,429 ****
.cc.obj:
! if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@
`$(CYGPATH_W) '$<'`; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f
"$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
--- 430,435 ----
.cc.obj:
! $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
`$(CYGPATH_W) '$<'`
! mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
***************
*** 431,436 ****
.cc.lo:
! if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f
"$(DEPDIR)/$*.Tpo"; exit 1; fi
# source='$<' object='$@' libtool=yes \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
--- 437,442 ----
.cc.lo:
! $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
! mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
# source='$<' object='$@' libtool=yes \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
***************
*** 442,452 ****
clean-libtool:
-rm -rf .libs _libs
-
- distclean-libtool:
- -rm -f libtool
- uninstall-info-am:
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
! test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
@list='$(pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--- 448,454 ----
clean-libtool:
-rm -rf .libs _libs
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
! test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
@list='$(pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
***************
*** 465,469 ****
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
! test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--- 467,471 ----
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
! test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
***************
*** 530,549 ****
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
--- 532,550 ----
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
! list='$(DISTFILES)'; \
! dist_files=`for file in $$list; do echo $$file; done | \
! sed -e "s|^$$srcdirstrip/||;t" \
! -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
! case $$dist_files in \
! */*) $(MKDIR_P) `echo "$$dist_files" | \
! sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
! sort -u` ;; \
! esac; \
! for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
***************
*** 563,567 ****
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
! test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
--- 564,568 ----
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
! test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
***************
*** 598,602 ****
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
! distclean-libtool distclean-tags
dvi: dvi-am
--- 599,603 ----
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
dvi: dvi-am
***************
*** 612,621 ****
--- 613,630 ----
install-data-am: install-includeHEADERS install-pkgdataDATA
+ install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ install-html: install-html-am
+
install-info: install-info-am
install-man:
+ install-pdf: install-pdf-am
+
+ install-ps: install-ps-am
+
installcheck-am:
***************
*** 639,644 ****
uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
! uninstall-info-am uninstall-libLTLIBRARIES \
! uninstall-pkgdataDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
--- 648,654 ----
uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
! uninstall-libLTLIBRARIES uninstall-pkgdataDATA
!
! .MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
***************
*** 647,659 ****
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
! install-data install-data-am install-exec install-exec-am \
install-includeHEADERS install-info install-info-am \
! install-libLTLIBRARIES install-man install-pkgdataDATA \
! install-strip installcheck installcheck-am installdirs \
! maintainer-clean maintainer-clean-generic mostlyclean \
! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
! pdf pdf-am ps ps-am tags uninstall uninstall-am \
! uninstall-binPROGRAMS uninstall-includeHEADERS \
! uninstall-info-am uninstall-libLTLIBRARIES \
uninstall-pkgdataDATA
--- 657,670 ----
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
! install-data install-data-am install-dvi install-dvi-am \
! install-exec install-exec-am install-html install-html-am \
install-includeHEADERS install-info install-info-am \
! install-libLTLIBRARIES install-man install-pdf install-pdf-am \
! install-pkgdataDATA install-ps install-ps-am install-strip \
! installcheck installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-compile \
! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
! tags uninstall uninstall-am uninstall-binPROGRAMS \
! uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-pkgdataDATA
Index: model_laser.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/model_laser.cc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** model_laser.cc 13 Oct 2007 07:42:55 -0000 1.1.2.4
--- model_laser.cc 22 Oct 2007 02:36:33 -0000 1.1.2.5
***************
*** 169,174 ****
double bearing = -fov/2.0;
! double sample_incr = fov / (double)(sample_count-1);
!
if( debug )
--- 169,173 ----
double bearing = -fov/2.0;
! double sample_incr = fov / (double)(sample_count-1);
if( debug )
Index: world.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/world.cc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** world.cc 13 Oct 2007 07:42:55 -0000 1.1.2.5
--- world.cc 22 Oct 2007 02:36:33 -0000 1.1.2.6
***************
*** 265,269 ****
// don't load window entries here
if( strcmp( typestr, "window" ) == 0 )
! continue;
int parent_entity = wf->GetEntityParent( entity );
--- 265,269 ----
// don't load window entries here
if( strcmp( typestr, "window" ) == 0 )
! continue;
int parent_entity = wf->GetEntityParent( entity );
***************
*** 299,303 ****
// warn about unused WF linesa
! wf->WarnUnused();
}
--- 299,303 ----
// warn about unused WF linesa
! //wf->WarnUnused();
}
***************
*** 310,313 ****
--- 310,315 ----
{
this->paused = false;
+
+ wf->WarnUnused();
}
Index: model_load.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Attic/model_load.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** model_load.cc 4 Oct 2007 01:17:02 -0000 1.1.2.1
--- model_load.cc 22 Oct 2007 02:36:33 -0000 1.1.2.2
***************
*** 8,14 ****
#include "stage.hh"
- //model.hh"
- //#include "world.hh"
-
void StgModel::Load( void )
{
--- 8,11 ----
***************
*** 16,20 ****
CWorldFile* wf = world->wf;
!
if( wf->PropertyExists( this->id, "name" ) )
{
--- 13,20 ----
CWorldFile* wf = world->wf;
!
! if( wf->PropertyExists( this->id, "debug" ) )
! this->debug = wf->ReadInt( this->id, "debug", this->debug );
!
if( wf->PropertyExists( this->id, "name" ) )
{
***************
*** 261,265 ****
! PRINT_DEBUG1( "Model \"%s\" loading complete.", token );
}
--- 261,268 ----
! if( this->debug )
! printf( "Model \"%s\" is in debug mode\n", token );
!
! PRINT_DEBUG1( "Model \"%s\" loading complete", token );
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
