diff options
| author | Chris Li <[email protected]> | 2010-02-05 01:29:43 -0800 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2010-02-05 15:34:28 +0000 |
| commit | 476b668ccc3f234676dbd3f15207eafe7965222e (patch) | |
| tree | 221b2d5e2499f1ff1d744d8a856ebe43da3e4657 | |
| parent | ad60552ca19bce657eadaffd31db752e34e9cda3 (diff) | |
allow make to build lp_test_* for llvmpipe
Signed-off-by: José Fonseca <[email protected]>
| -rw-r--r-- | configs/linux-llvm | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/Makefile | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/configs/linux-llvm b/configs/linux-llvm index 988b7057d4e..4bb5ff8868f 100644 --- a/configs/linux-llvm +++ b/configs/linux-llvm @@ -31,7 +31,7 @@ ifeq ($(MESA_LLVM),1) # LLVM_CFLAGS=`llvm-config --cflags` LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation) - LLVM_LIBS = $(shell llvm-config --libs backend bitreader engine ipo interpreter instrumentation) + LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation) MKLIB_OPTIONS=-cplusplus else LLVM_CFLAGS= diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile index 899af6acf84..698078bc376 100644 --- a/src/gallium/drivers/llvmpipe/Makefile +++ b/src/gallium/drivers/llvmpipe/Makefile @@ -74,3 +74,16 @@ lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxil # to make a .s file to inspect assembly code .c.s: $(CC) -S $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $< + + +testprogs := lp_test_format \ + lp_test_blend \ + lp_test_conv + +LIBS += $(GL_LIB_DEPS) -L. -lllvmpipe -L../../auxiliary/ -lgallium + +$(testprogs): lp_test_% : lp_test_%.o lp_test_main.o + $(LD) $^ -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group + + +default: $(testprogs) |