projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 45d1dc2)
glslcompiler: fix build again
authorBrian Paul <brianp@vmware.com>
Mon, 22 Mar 2010 19:36:27 +0000 (13:36 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 22 Mar 2010 19:36:30 +0000 (13:36 -0600)
Simply use the libglapi.a archive instead of individual .o files.
Fixes the non-debug build.

src/mesa/drivers/glslcompiler/Makefile patch | blob | history

diff --git a/src/mesa/drivers/glslcompiler/Makefile b/src/mesa/drivers/glslcompiler/Makefile
index 1b9a056baae382897aaea9cd206e171b425af434..7dcf9a6541ae2bc4a37b9c696f629f5cbcf3d584 100644 (file)
--- 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 \