summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-03-22 13:36:27 -0600
committerBrian Paul <[email protected]>2010-03-22 13:36:30 -0600
commitf42acbeebf8267b61d89c0d1be5cb26009a30496 (patch)
treeefcd5969fa6b89c9d6aae062fd005ea9dbf55c2e
parent45d1dc26072ea83ee10cf1c8907cfdf5df51928e (diff)
glslcompiler: fix build again
Simply use the libglapi.a archive instead of individual .o files. Fixes the non-debug build.
-rw-r--r--src/mesa/drivers/glslcompiler/Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/drivers/glslcompiler/Makefile b/src/mesa/drivers/glslcompiler/Makefile
index 1b9a056baae..7dcf9a6541a 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 \