[PATCH] Don't try to link OSMesa with shared glapi unless shared glapi is built
Jon TURNEY
jon.turney at dronecode.org.uk
Wed Jan 25 14:14:42 PST 2012
This fixes the fact that 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2 is left
even after the reversion in 027ce0c493a85c863df88b43f61aea34bcd4cd58 made
shared glapi optional again
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
src/mesa/drivers/osmesa/Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index 005f4d5..6fae251 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -25,7 +25,9 @@ CORE_MESA = \
$(TOP)/src/mapi/glapi/libglapi.a \
$(TOP)/src/glsl/libglsl.a
+ifeq ($(SHARED_GLAPI),1)
OSMESA_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(OSMESA_LIB_DEPS)
+endif
.c.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
--
1.7.5.1
--------------050404020307050307030700--
More information about the mesa-dev
mailing list