Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28482/libstage
Modified Files:
Makefile Makefile.am model_load.cc
Log Message:
added STAGEPATH searching for controller plugins
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 20 Feb 2008 06:03:58 -0000 1.4
--- Makefile.am 22 Feb 2008 20:33:48 -0000 1.5
***************
*** 17,21 ****
# build the stage library
! lib_LTLIBRARIES = libstage.la ctrl.la
# The stage library
--- 17,21 ----
# build the stage library
! lib_LTLIBRARIES = libstage.la wander.la
# The stage library
***************
*** 46,66 ****
worldgui.cc
- #logo.cc
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ -lltdl
! # build stest, a stand-alone test binary using the stage library,
! #bin_PROGRAMS = stest stage
! #stest_DEPENDENCIES = libstage.la
! #stest_SOURCES = stest.cc
! #stest_LDADD = libstage.la
!
bin_PROGRAMS = stage
-
stage_DEPENDENCIES = libstage.la
stage_SOURCES = main.cc
stage_LDADD = libstage.la
! ctrl_la_SOURCES = ctrl.cc stage.hh
! ctrl_la_LDFLAGS = -module
--- 46,60 ----
worldgui.cc
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ -lltdl
! # 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
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile 21 Feb 2008 23:55:29 -0000 1.10
--- Makefile 22 Feb 2008 20:33:48 -0000 1.11
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.9.6 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 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,
***************
*** 23,35 ****
- 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
--- 23,31 ----
***************
*** 43,49 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i686-pc-linux-gnu
! host_triplet = i686-pc-linux-gnu
! target_triplet = i686-pc-linux-gnu
bin_PROGRAMS = stage$(EXEEXT)
subdir = libstage
--- 39,45 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i386-apple-darwin9.2.0
! host_triplet = i386-apple-darwin9.2.0
! target_triplet = i386-apple-darwin9.2.0
bin_PROGRAMS = stage$(EXEEXT)
subdir = libstage
***************
*** 68,74 ****
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
- ctrl_la_LIBADD =
- am_ctrl_la_OBJECTS = ctrl.lo
- ctrl_la_OBJECTS = $(am_ctrl_la_OBJECTS)
libstage_la_DEPENDENCIES =
am_libstage_la_OBJECTS = ancestor.lo block.lo canvas.lo gl.lo \
--- 64,67 ----
***************
*** 78,106 ****
world.lo worldfile.lo worldgui.lo
libstage_la_OBJECTS = $(am_libstage_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_stage_OBJECTS = main.$(OBJEXT)
stage_OBJECTS = $(am_stage_OBJECTS)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
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 $@
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 $@
! SOURCES = $(ctrl_la_SOURCES) $(libstage_la_SOURCES) $(stage_SOURCES)
! DIST_SOURCES = $(ctrl_la_SOURCES) $(libstage_la_SOURCES) \
$(stage_SOURCES)
pkgdataDATA_INSTALL = $(INSTALL_DATA)
--- 71,110 ----
world.lo worldfile.lo worldgui.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 $@
+ 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)
am_stage_OBJECTS = main.$(OBJEXT)
stage_OBJECTS = $(am_stage_OBJECTS)
! DEFAULT_INCLUDES = -I. -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
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 $@
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 $@
! SOURCES = $(libstage_la_SOURCES) $(wander_la_SOURCES) $(stage_SOURCES)
! DIST_SOURCES = $(libstage_la_SOURCES) $(wander_la_SOURCES) \
$(stage_SOURCES)
pkgdataDATA_INSTALL = $(INSTALL_DATA)
***************
*** 111,122 ****
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! ACLOCAL = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run aclocal-1.9
! AMDEP_FALSE = #
! AMDEP_TRUE =
! AMTAR = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run tar
AR = ar
! AUTOCONF = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run autoconf
! AUTOHEADER = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run autoheader
! AUTOMAKE = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run automake-1.9
AWK = gawk
CC = gcc
--- 115,124 ----
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! ACLOCAL = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run aclocal-1.10
! AMTAR = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run tar
AR = ar
! AUTOCONF = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run autoconf
! AUTOHEADER = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run autoheader
! AUTOMAKE = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run automake-1.10
AWK = gawk
CC = gcc
***************
*** 132,155 ****
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
! ECHO = echo
! ECHO_C =
! ECHO_N = -n
ECHO_T =
! EGREP = /bin/grep -E
EXEEXT =
! F77 = gfortran
! FFLAGS = -g -O2
! FLTK_CFLAGS = -I/usr/local/include
! FLTK_LIBS = -L/usr/local/lib -lfltk_images -lpng -lz -ljpeg -lfltk_gl -lGLU
-lGL -lfltk -lm -lXext -lX11
! 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}
INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
LDFLAGS =
LIBOBJS =
--- 134,154 ----
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
! ECHO = /bin/echo
! ECHO_C = \c
! ECHO_N =
ECHO_T =
! EGREP = /usr/bin/grep -E
EXEEXT =
! F77 =
! FFLAGS =
! FLTK_CFLAGS = -I/opt/local/include -I/opt/local/include/FL/images
! FLTK_LIBS = -L/opt/local/lib -lfltk_images -lfltk_png -lz -lfltk_jpeg
-lfltk_gl -framework AGL -framework OpenGL -lfltk -framework Carbon -framework
ApplicationServices
! GREP = /usr/bin/grep
HAVE_FLTK_CONFIG = fltk-config
! INSTALL = /opt/local/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LDFLAGS =
LIBOBJS =
***************
*** 159,163 ****
LN_S = ln -s
LTLIBOBJS =
! MAKEINFO = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run makeinfo
OBJEXT = o
PACKAGE = stage
--- 158,163 ----
LN_S = ln -s
LTLIBOBJS =
! MAKEINFO = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run makeinfo
! MKDIR_P = /opt/local/bin/gmkdir -p
OBJEXT = o
PACKAGE = stage
***************
*** 168,191 ****
PACKAGE_VERSION = 3.0.0
PATH_SEPARATOR = :
! PIXBUF_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include
! 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
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 3.0.0
ac_ct_CC = gcc
ac_ct_CXX = g++
! ac_ct_F77 = gfortran
! am__fastdepCC_FALSE = #
! am__fastdepCC_TRUE =
! am__fastdepCXX_FALSE = #
! am__fastdepCXX_TRUE =
am__include = include
am__leading_dot = .
--- 168,190 ----
PACKAGE_VERSION = 3.0.0
PATH_SEPARATOR = :
! PIXBUF_CFLAGS = -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
! PIXBUF_LIBS = -L/opt/local/lib -lgdk_pixbuf-2.0 -lgobject-2.0 -lgmodule-2.0
-lglib-2.0 -lintl -liconv
! PKG_CONFIG = /opt/local/bin/pkg-config
! PLAYERC_CFLAGS = -I/Users/vaughan/PS-2.0/include/player-2.1
! PLAYERC_LIBS = -L/Users/vaughan/PS-2.0/lib -lplayerc -lm -lplayerxdr
-lplayererror
! PLAYER_CFLAGS = -I/Users/vaughan/PS-2.0/include/player-2.1
! PLAYER_LIBS = -L/Users/vaughan/PS-2.0/lib -lplayercore -lltdl -lpthread
-lplayererror
RANLIB = ranlib
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 3.0.0
+ abs_builddir = /Users/vaughan/PS/HEAD/stage/libstage
+ abs_srcdir = /Users/vaughan/PS/HEAD/stage/libstage
+ abs_top_builddir = /Users/vaughan/PS/HEAD/stage
+ abs_top_srcdir = /Users/vaughan/PS/HEAD/stage
ac_ct_CC = gcc
ac_ct_CXX = g++
! ac_ct_F77 =
am__include = include
am__leading_dot = .
***************
*** 194,202 ****
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i686-pc-linux-gnu
build_alias =
! build_cpu = i686
! build_os = linux-gnu
! build_vendor = pc
datadir = ${datarootdir}
datarootdir = ${prefix}/share
--- 193,202 ----
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i386-apple-darwin9.2.0
build_alias =
! build_cpu = i386
! build_os = darwin9.2.0
! build_vendor = apple
! builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
***************
*** 205,217 ****
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i686-pc-linux-gnu
host_alias =
! host_cpu = i686
! host_os = linux-gnu
! host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
! install_sh = /home/vaughan/PS/HEAD/stage/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
--- 205,217 ----
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i386-apple-darwin9.2.0
host_alias =
! host_cpu = i386
! host_os = darwin9.2.0
! host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
! install_sh = $(SHELL) /Users/vaughan/PS/HEAD/stage/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
***************
*** 219,236 ****
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
! mkdir_p = mkdir -p --
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /usr/local
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
! target = i686-pc-linux-gnu
target_alias =
! target_cpu = i686
! target_os = linux-gnu
! target_vendor = pc
# install the header file for the Stage library
--- 219,239 ----
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
! mkdir_p = /opt/local/bin/gmkdir -p
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-darwin9.2.0
target_alias =
! target_cpu = i386
! target_os = darwin9.2.0
! target_vendor = apple
! top_builddir = ..
! top_srcdir = ..
# install the header file for the Stage library
***************
*** 242,249 ****
# system-wide compile flags - target-specific flags are added to each target
below
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/usr/include/gtk-2.0
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/local/include
-DRGBFILE=\"$(RGB)\"
# build the stage library
! lib_LTLIBRARIES = libstage.la ctrl.la
# The stage library
--- 245,252 ----
# system-wide compile flags - target-specific flags are added to each target
below
! 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
***************
*** 274,286 ****
worldgui.cc
-
- #logo.cc
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = -lgdk_pixbuf-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0 -L/usr/local/lib -lfltk_images -lpng -lz -ljpeg -lfltk_gl -lGLU
-lGL -lfltk -lm -lXext -lX11 -lltdl
stage_DEPENDENCIES = libstage.la
stage_SOURCES = main.cc
stage_LDADD = libstage.la
! ctrl_la_SOURCES = ctrl.cc stage.hh
! ctrl_la_LDFLAGS = -module
all: all-am
--- 277,289 ----
worldgui.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_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
***************
*** 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 \
--- 321,325 ----
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 \
***************
*** 329,333 ****
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'"; \
--- 332,336 ----
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'"; \
***************
*** 343,353 ****
rm -f "$${dir}/so_locations"; \
done
- ctrl.la: $(ctrl_la_OBJECTS) $(ctrl_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(ctrl_la_LDFLAGS) $(ctrl_la_OBJECTS)
$(ctrl_la_LIBADD) $(LIBS)
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)$$//'`; \
--- 346,356 ----
rm -f "$${dir}/so_locations"; \
done
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)
! test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
***************
*** 377,381 ****
stage$(EXEEXT): $(stage_OBJECTS) $(stage_DEPENDENCIES)
@rm -f stage$(EXEEXT)
! $(CXXLINK) $(stage_LDFLAGS) $(stage_OBJECTS) $(stage_LDADD) $(LIBS)
mostlyclean-compile:
--- 380,384 ----
stage$(EXEEXT): $(stage_OBJECTS) $(stage_DEPENDENCIES)
@rm -f stage$(EXEEXT)
! $(CXXLINK) $(stage_OBJECTS) $(stage_LDADD) $(LIBS)
mostlyclean-compile:
***************
*** 408,413 ****
.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) \
--- 411,416 ----
.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) \
***************
*** 415,420 ****
.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) \
--- 418,423 ----
.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) \
***************
*** 422,427 ****
.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) \
--- 425,430 ----
.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) \
***************
*** 433,443 ****
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; \
--- 436,442 ----
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; \
***************
*** 456,460 ****
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; \
--- 455,459 ----
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; \
***************
*** 521,540 ****
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; \
--- 520,538 ----
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; \
***************
*** 554,558 ****
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
! test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
--- 552,556 ----
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
! test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
***************
*** 589,593 ****
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
! distclean-libtool distclean-tags
dvi: dvi-am
--- 587,591 ----
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
dvi: dvi-am
***************
*** 603,612 ****
--- 601,618 ----
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:
***************
*** 630,635 ****
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 \
--- 636,642 ----
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 \
***************
*** 638,650 ****
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
--- 645,658 ----
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_load.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/model_load.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** model_load.cc 21 Feb 2008 03:35:05 -0000 1.5
--- model_load.cc 22 Feb 2008 20:33:48 -0000 1.6
***************
*** 374,408 ****
void StgModel::LoadControllerModule( char* lib )
{
! printf( "Loading controller \"%s\" ...", lib );
!
/* Initialise libltdl. */
int errors = lt_dlinit();
assert(errors==0);
! // TODO - do this properly!
! lt_dlsetsearchpath( ".:.libs:/usr/lib/" );
!
lt_dlhandle handle = NULL;
if(( handle = lt_dlopenext( lib ) ))
! puts( "success." );
else
- puts( "fail." );
-
- this->initfunc = (ctrlinit_t*)lt_dlsym( handle, "Init" );
- if( this->initfunc == NULL )
{
! puts( lt_dlerror() );
}
! assert( this->initfunc );
!
! // this->updatefunc = (ctrlupdate_t*)lt_dlsym( handle, "Update" );
! // if( this->updatefunc == NULL )
! // {
! // puts( lt_dlerror() );
! // }
! // assert( this->updatefunc );
!
! //this->Subscribe(); // causes the model to startup and update
}
--- 374,412 ----
void StgModel::LoadControllerModule( char* lib )
{
! printf( "[Ctrl \"%s\"", lib );
! fflush(stdout);
!
/* Initialise libltdl. */
int errors = lt_dlinit();
assert(errors==0);
! char* stagepath = getenv("STAGEPATH");
! if( stagepath == NULL )
! stagepath = ".";
!
! lt_dlsetsearchpath( stagepath );
!
lt_dlhandle handle = NULL;
if(( handle = lt_dlopenext( lib ) ))
! {
! printf( "]" );
!
! this->initfunc = (ctrlinit_t*)lt_dlsym( handle, "Init" );
! if( this->initfunc == NULL )
! {
! printf( "Libtool error: %s. Something is wrong with your plugin.
Quitting\n",
! lt_dlerror() ); // report the error from libtool
! exit(-1);
! }
! }
else
{
! PRINT_ERR1( "Failed to open \"%s\". Check that it can be found by
searching the directories in your STAGEPATH environment variable, or the
current directory if STAGEPATH is not set.]\n", lib );
! exit(-1);
}
!
! fflush(stdout);
}
+
-------------------------------------------------------------------------
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
