From d08ca95d62078d13b6e1dd6ad225f6178e3216d3 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 18 Feb 2010 14:59:01 +0000 Subject: [PATCH 3/3] Cygwin build fix: Link X11 driver libGL with GLSL libs Link X11 driver libGL with GLSL libs Signed-off-by: Jon TURNEY --- src/mesa/drivers/x11/Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index 5e427d2..927ae7e 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -44,9 +44,10 @@ INCLUDE_DIRS = \ -I$(TOP)/src/mesa/main \ $(X11_INCLUDES) -CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a - - +CORE_MESA = $(TOP)/src/mesa/libmesa.a \ + $(TOP)/src/mesa/libglapi.a \ + $(TOP)/src/glsl/pp/libglslpp.a \ + $(TOP)/src/glsl/cl/libglslcl.a .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ -- 1.6.6.1