diff options
author | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
commit | 733df0059f04e3fd7e3265d3c80dd8029f939c60 (patch) | |
tree | 5073edcb41611b86c9a62fa75c2c089fd2babf48 /src/gallium/auxiliary/Makefile | |
parent | 6fb364a1717858d8201b2caf234076ce5d4832ac (diff) | |
parent | 5fa09846618ed702493f054a1d4b0ec2a28fbbd0 (diff) | |
download | external_mesa3d-733df0059f04e3fd7e3265d3c80dd8029f939c60.zip external_mesa3d-733df0059f04e3fd7e3265d3c80dd8029f939c60.tar.gz external_mesa3d-733df0059f04e3fd7e3265d3c80dd8029f939c60.tar.bz2 |
Merge branch 'master' into gallium-new-formats
Conflicts:
src/gallium/auxiliary/util/u_format.csv
Diffstat (limited to 'src/gallium/auxiliary/Makefile')
-rw-r--r-- | src/gallium/auxiliary/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index e1c3bc4..452eceb 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -155,6 +155,7 @@ GALLIVM_SOURCES = \ gallivm/lp_bld_intr.c \ gallivm/lp_bld_logic.c \ gallivm/lp_bld_pack.c \ + gallivm/lp_bld_printf.c \ gallivm/lp_bld_sample.c \ gallivm/lp_bld_sample_soa.c \ gallivm/lp_bld_struct.c \ |