diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-09-07 23:45:43 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-09-07 23:54:25 +0800 |
| commit | 28c790ab3118ee4c4171120cba2abf2ae3e84805 (patch) | |
| tree | f32863a9d2d6a92c3b058205ba52063fbce874dc /src/gallium/targets/libgl-xlib | |
| parent | d5c5a5aea034a8a647d686bdcb88f78445469f82 (diff) | |
libgl-xlib: Fix --enable-gallium-llvm build.
Check MESA_LLVM and link to LLVM as other targets do.
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile index 88cc0cca6a..79e516a2a7 100644 --- a/src/gallium/targets/libgl-xlib/Makefile +++ b/src/gallium/targets/libgl-xlib/Makefile @@ -51,6 +51,14 @@ LIBS = \ $(CELL_SPU_LIB) \ +# LLVM +ifeq ($(MESA_LLVM),1) +DEFINES += -DGALLIUM_LLVMPIPE +GL_LIB_DEPS += $(LLVM_LIBS) +LDFLAGS += $(LLVM_LDFLAGS) +endif + + .SUFFIXES : .cpp .c.o: @@ -69,7 +77,7 @@ $(TOP)/$(LIB_DIR)/gallium: # Make the libGL.so library $(TOP)/$(LIB_DIR)/gallium/$(GL_LIB_NAME): $(XLIB_TARGET_OBJECTS) $(LIBS) Makefile $(TOP)/bin/mklib -o $(GL_LIB) \ - -linker "$(CXX)" \ + -linker "$(CXX)" -ldflags '$(LDFLAGS)' \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -cplusplus \ -install $(TOP)/$(LIB_DIR)/gallium \ |