Mesa (master): Revert "Fix underlinking in libOSMesa since commit adefee5 " Always build shared glapi""

Brian Paul brianp at kemper.freedesktop.org
Thu Feb 2 15:18:37 UTC 2012


Module: Mesa
Branch: master
Commit: e20e30b28c5c61f99e61f64d84d8bcb0577f1318
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e20e30b28c5c61f99e61f64d84d8bcb0577f1318

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Feb  2 08:14:35 2012 -0700

Revert "Fix underlinking in libOSMesa since commit adefee5 "Always build shared glapi""

This reverts commit 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2.
... to fix build with --enable-osmesa

---

 src/mesa/drivers/osmesa/Makefile |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index 005f4d5..39ab09a 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -25,8 +25,6 @@ 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 $@
 




More information about the mesa-commit mailing list