Mesa (master): glslcompiler: fix build again

Brian Paul brianp at kemper.freedesktop.org
Mon Mar 22 12:37:12 PDT 2010


Module: Mesa
Branch: master
Commit: f42acbeebf8267b61d89c0d1be5cb26009a30496
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f42acbeebf8267b61d89c0d1be5cb26009a30496

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Mar 22 13:36:27 2010 -0600

glslcompiler: fix build again

Simply use the libglapi.a archive instead of individual .o files.
Fixes the non-debug build.

---

 src/mesa/drivers/glslcompiler/Makefile |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/glslcompiler/Makefile b/src/mesa/drivers/glslcompiler/Makefile
index 1b9a056..7dcf9a6 100644
--- a/src/mesa/drivers/glslcompiler/Makefile
+++ b/src/mesa/drivers/glslcompiler/Makefile
@@ -9,14 +9,9 @@ PROGRAM = glslcompiler
 
 OBJECTS = \
 	glslcompiler.o \
-	../../glapi/glapi.o \
-	../../glapi/glapi_entrypoint.o \
-	../../glapi/glapi_getproc.o \
-	../../glapi/glapi_dispatch.o \
-	../../glapi/glapi_nop.o \
-	../../glapi/glthread.o \
 	../common/driverfuncs.o \
-	../../libmesa.a
+	../../libmesa.a \
+	../../libglapi.a
 
 INCLUDES = \
 	-I$(TOP)/include \



More information about the mesa-commit mailing list