Mesa (glsl2): osmesa: link with new libglsl.a lib

Brian Paul brianp at kemper.freedesktop.org
Wed Aug 11 21:06:42 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 9b2d3c3285596a14a399c8243b1f426d887dc9d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b2d3c3285596a14a399c8243b1f426d887dc9d7

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Aug 11 14:27:56 2010 -0600

osmesa: link with new libglsl.a lib

---

 src/mesa/drivers/osmesa/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index c6b4a04..091e6f6 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -23,8 +23,7 @@ INCLUDE_DIRS = \
 CORE_MESA = \
 	$(TOP)/src/mesa/libmesa.a \
 	$(TOP)/src/mapi/glapi/libglapi.a \
-	$(TOP)/src/glsl/cl/libglslcl.a \
-	$(TOP)/src/glsl/pp/libglslpp.a
+	$(TOP)/src/glsl/libglsl.a
 
 .c.o:
 	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@




More information about the mesa-commit mailing list