diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/egl/Makefile | 6 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile index 017c1952141..92d971bab01 100644 --- a/src/gallium/targets/egl/Makefile +++ b/src/gallium/targets/egl/Makefile @@ -123,8 +123,12 @@ endif # OpenGL state tracker GL_CPPFLAGS := -I$(TOP)/src/mesa $(API_DEFINES) -# cannot not link to $(GL_LIB) as the app might want GLES +ifeq ($(SHARED_GLAPI),1) +GL_SYS := $(DRI_LIB_DEPS) -l$(GLAPI_LIB) +else +# cannot link to $(GL_LIB) as the app might want GL or GLES GL_SYS := $(DRI_LIB_DEPS) +endif GL_LIBS := $(TOP)/src/mesa/libmesagallium.a # OpenVG state tracker diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile index fb537c31556..53a6c33ed82 100644 --- a/src/gallium/targets/libgl-xlib/Makefile +++ b/src/gallium/targets/libgl-xlib/Makefile @@ -60,6 +60,10 @@ 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 |