On Mon, Dec 21, 2009 at 8:09 PM, Robert Noland <rnol...@2hip.net> wrote: > Signed-off-by: Robert Noland <rnol...@2hip.net> > --- > src/mesa/drivers/dri/Makefile.template | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/src/mesa/drivers/dri/Makefile.template > b/src/mesa/drivers/dri/Makefile.template > index 39d25ce..39a23b7 100644 > --- a/src/mesa/drivers/dri/Makefile.template > +++ b/src/mesa/drivers/dri/Makefile.template > @@ -2,6 +2,9 @@ > > MESA_MODULES = $(TOP)/src/mesa/libmesa.a > > +GLSL_MODULES = $(TOP)/src/glsl/cl/libglslcl.a \ > + $(TOP)/src/glsl/pp/libglslpp.a > + > COMMON_GALLIUM_SOURCES = \ > ../common/utils.c \ > ../common/vblank.c \ > @@ -71,7 +74,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) > $(WINOBJ) Makefile \ > $(TOP)/src/mesa/drivers/dri/Makefile.template > $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ > $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \ > - $(DRI_LIB_DEPS) > + $(GLSL_MODULES) $(DRI_LIB_DEPS) > > > $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) > --
This patch shouldn't be needed. The libglslcl.a and libglslpp.a archives get included in the libmesa.a archive already. Things run OK here as-is. -Brian ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
