diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /src/gallium/auxiliary/util/SConscript | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/gallium/auxiliary/util/SConscript')
| -rw-r--r-- | src/gallium/auxiliary/util/SConscript | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/SConscript b/src/gallium/auxiliary/util/SConscript new file mode 100644 index 0000000000..35f683fb8e --- /dev/null +++ b/src/gallium/auxiliary/util/SConscript @@ -0,0 +1,30 @@ +Import('*') + +util = env.ConvenienceLibrary( + target = 'util', + source = [ + 'p_debug.c', + 'p_debug_mem.c', + 'p_debug_prof.c', + 'u_blit.c', + 'u_cache.c', + 'u_draw_quad.c', + 'u_gen_mipmap.c', + 'u_handle_table.c', + 'u_hash.c', + 'u_hash_table.c', + 'u_keymap.c', + 'u_math.c', + 'u_mm.c', + 'u_rect.c', + 'u_simple_shaders.c', + 'u_snprintf.c', + 'u_stream_stdc.c', + 'u_stream_wd.c', + 'u_tile.c', + 'u_time.c', + 'u_timed_winsys.c', + 'u_simple_screen.c', + ]) + +auxiliaries.insert(0, util) |