diff options
| author | Francisco Jerez <[email protected]> | 2012-04-25 22:16:26 +0200 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2012-05-11 12:39:44 +0200 |
| commit | 66f7fd99fa1d8c8e3b09fadd5624db9968b67506 (patch) | |
| tree | 823985fa137d154aa4557767f97f47d54191a954 /src/gallium/tests/trivial/Makefile | |
| parent | 317be33d73228fe8b340de8e029ff24b6e0d95b5 (diff) | |
gallium/tests/trivial: Switch to the pipe loader.
It simplifies things slightly, and besides, it makes possible to
execute the trivial tests on a hardware device instead of being
limited to software rendering.
Reviewed-by: Jakob Bornecrantz <[email protected]>
Diffstat (limited to 'src/gallium/tests/trivial/Makefile')
| -rw-r--r-- | src/gallium/tests/trivial/Makefile | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/gallium/tests/trivial/Makefile b/src/gallium/tests/trivial/Makefile index 4ddbb0b73dc..bfe186b1607 100644 --- a/src/gallium/tests/trivial/Makefile +++ b/src/gallium/tests/trivial/Makefile @@ -11,19 +11,10 @@ INCLUDES = \ -I$(TOP)/src/gallium/winsys \ $(PROG_INCLUDES) -ifeq ($(MESA_LLVM),1) -LINKS = $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a -LDFLAGS += $(LLVM_LDFLAGS) -endif - LINKS += \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ - $(TOP)/src/gallium/winsys/sw/null/libws_null.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ + $(GALLIUM_PIPE_LOADER_LIBS) \ $(GALLIUM_AUXILIARIES) \ - $(PROG_LINKS) + $(PROG_LINKS) $(LIBUDEV_LIBS) SOURCES = \ tri.c \ @@ -33,17 +24,25 @@ OBJECTS = $(SOURCES:.c=.o) PROGS = $(OBJECTS:.o=) -PROG_DEFINES = \ - -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD +PROG_DEFINES = -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)\" \ + $(GALLIUM_PIPE_LOADER_DEFINES) + +PIPE_SRC_DIR = $(TOP)/src/gallium/targets/pipe-loader ##### TARGETS ##### -default: $(PROGS) +default: $(PROGS) pipes + +install: clean: -rm -f $(PROGS) -rm -f *.o -rm -f result.bmp + @$(MAKE) -C $(PIPE_SRC_DIR) clean + +pipes: + @$(MAKE) -C $(PIPE_SRC_DIR) ##### RULES ##### |