From 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sun, 22 Jan 2012 13:23:26 +0000 Subject: [PATCH] Fix underlinking in libOSMesa since commit adefee5 "Always build shared glapi" Since we now always build shared glapi, this exposes the fact that libOSMesa was underlinked when glapi was built shared. Fix this by doing the same thing as drivers/X11/Makefile already does, ensuring that the library is linked with the shared glapi library. (I'm not clear why we link with both glapi.a and glapi.so, so this may be all wrong) Signed-off-by: Jon TURNEY --- src/mesa/drivers/osmesa/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile index 39ab09a..005f4d5 100644 --- a/src/mesa/drivers/osmesa/Makefile +++ b/src/mesa/drivers/osmesa/Makefile @@ -25,6 +25,8 @@ CORE_MESA = \ $(TOP)/src/mapi/glapi/libglapi.a \ $(TOP)/src/glsl/libglsl.a +OSMESA_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(OSMESA_LIB_DEPS) + .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ -- 2.7.4