diff options
| author | Matt Turner <[email protected]> | 2012-01-24 11:34:42 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-24 11:34:42 -0500 |
| commit | 027ce0c493a85c863df88b43f61aea34bcd4cd58 (patch) | |
| tree | f845bb4ce46ffe9dfa3e77ed88f51d4e354ade96 /src/mesa | |
| parent | a208468e04353239f2876cc2013f860b48a4f1c1 (diff) | |
Revert "Always build shared glapi"
This reverts commit adefee50d954151f76150af80207081ae3c247d9.
Shared glapi was never tested with --enable-xlib-glx and turns out
to cause a lot of problems.
Conflicts:
configure.ac
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/x11/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index acb6f082956..412fbfe1aee 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -44,7 +44,9 @@ INCLUDE_DIRS = \ CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mapi/glapi/libglapi.a +ifeq ($(SHARED_GLAPI),1) GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS) +endif .c.o: |