diff options
| author | Matt Turner <[email protected]> | 2012-01-11 18:32:14 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-20 14:56:42 -0500 |
| commit | adefee50d954151f76150af80207081ae3c247d9 (patch) | |
| tree | c70cf0abe077c38d76a22eef437673a6692dd2bf /src/gallium | |
| parent | 2fdbbeca43e7b57095774e4228e6eea75a180fab (diff) | |
Always build shared glapi
libglapi.so, libGL.so, libGLESv2.so, libGLESv1_CM.so must all
come from the same version of Mesa or bad things may happen.
Acked-by: Kenneth Graunke <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile | 7 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 79a098af448..9e8777402cb 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -8,7 +8,6 @@ # EGL_PLATFORMS - platforms to support # EGL_CLIENT_APIS - state trackers to support # GALLIUM_WINSYS_DIRS - pipe drivers to support -# SHARED_GLAPI - st/mesa can be statically linked or not # TOP = ../../../.. @@ -70,14 +69,8 @@ endif # st/mesa ifneq ($(filter $(GL_LIB), $(EGL_CLIENT_APIS)),) egl_CPPFLAGS += -I$(TOP)/src/mesa $(API_DEFINES) -# make st/mesa built-in when there is a single glapi provider -ifeq ($(SHARED_GLAPI),1) egl_LIBS += $(TOP)/src/mesa/libmesagallium.a egl_SYS += -lm -lpthread $(DLOPEN_LIBS) -l$(GLAPI_LIB) -else -egl_CPPFLAGS += -D_EGL_EXTERNAL_GL=1 -OUTPUTS += st_GL -endif # SHARED_GLAPI endif # st/vega diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile index 867b2da323b..479e0855985 100644 --- a/src/gallium/targets/libgl-xlib/Makefile +++ b/src/gallium/targets/libgl-xlib/Makefile @@ -58,9 +58,7 @@ GL_LIB_DEPS += $(LLVM_LIBS) LDFLAGS += $(LLVM_LDFLAGS) endif -ifeq ($(SHARED_GLAPI),1) GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS) -endif .SUFFIXES : .cpp |