summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-06-16 09:23:17 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-06-16 09:23:17 -0700
commitcbf30fce322506bd43692617de9d201533f41532 (patch)
tree2944f8425c07d57e726169cdc08075e9b882d3db /src
parent1c377cea1094c0b5414c663adf2fd393bf41ddfb (diff)
osmesa: always build standalone for internal symbols
When building OSMesa and xlib GL, the resulting OSMesa would be linked against libGL instead of the internal mesa libraries. However, when building with -fvisibility=hidden, some of the internal functions used in OSMesa could not be resolved through libGL. Instead, always build OSMesa standalone without linking against libGL. This has the advantage that OSMesa is always built the same way, but it means that disk space is wasted when libGL is installed since both libraries will contain the internal objects. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Tom Fogal <tfogal@alumni.unh.edu>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/osmesa/Makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index ea49a89659..c6b4a04085 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -20,17 +20,11 @@ INCLUDE_DIRS = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main
-# Standalone osmesa needs to be linked with core Mesa APIs
-ifeq ($(DRIVER_DIRS), osmesa)
CORE_MESA = \
$(TOP)/src/mesa/libmesa.a \
$(TOP)/src/mapi/glapi/libglapi.a \
$(TOP)/src/glsl/cl/libglslcl.a \
$(TOP)/src/glsl/pp/libglslpp.a
-else
-CORE_MESA =
-endif
-
.c.o:
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@