diff options
| author | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
| commit | 78faf8d0e9c276a0ff1465e501d58fb3d66de2f7 (patch) | |
| tree | 4e124bd6b511e408c5e113c4166b8fa97fd75b24 /src/gallium/targets/libgl-xlib/Makefile | |
| parent | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (diff) | |
| parent | 37233f1ee0213a224611788bbab38840ba9f8308 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
Diffstat (limited to 'src/gallium/targets/libgl-xlib/Makefile')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
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 |