diff options
| -rw-r--r-- | src/gallium/drivers/r300/Makefile | 63 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/Makefile.sources | 57 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/SConscript | 57 |
3 files changed, 63 insertions, 114 deletions
diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile index 4f021276a8f..5f56fc458b3 100644 --- a/src/gallium/drivers/r300/Makefile +++ b/src/gallium/drivers/r300/Makefile @@ -3,64 +3,11 @@ include $(TOP)/configs/current LIBNAME = r300 -C_SOURCES = \ - r300_blit.c \ - r300_chipset.c \ - r300_context.c \ - r300_debug.c \ - r300_emit.c \ - r300_flush.c \ - r300_fs.c \ - r300_hyperz.c \ - r300_query.c \ - r300_render.c \ - r300_render_stencilref.c \ - r300_render_translate.c \ - r300_resource.c \ - r300_screen.c \ - r300_screen_buffer.c \ - r300_state.c \ - r300_state_derived.c \ - r300_vs.c \ - r300_vs_draw.c \ - r300_texture.c \ - r300_texture_desc.c \ - r300_tgsi_to_rc.c \ - r300_transfer.c \ - \ - compiler/radeon_code.c \ - compiler/radeon_compiler.c \ - compiler/radeon_compiler_util.c \ - compiler/radeon_emulate_branches.c \ - compiler/radeon_emulate_loops.c \ - compiler/radeon_program.c \ - compiler/radeon_program_print.c \ - compiler/radeon_opcodes.c \ - compiler/radeon_program_alu.c \ - compiler/radeon_program_pair.c \ - compiler/radeon_program_tex.c \ - compiler/radeon_pair_translate.c \ - compiler/radeon_pair_schedule.c \ - compiler/radeon_pair_regalloc.c \ - compiler/radeon_pair_dead_sources.c \ - compiler/radeon_dataflow.c \ - compiler/radeon_dataflow_deadcode.c \ - compiler/radeon_dataflow_swizzles.c \ - compiler/radeon_list.c \ - compiler/radeon_optimize.c \ - compiler/radeon_remove_constants.c \ - compiler/radeon_rename_regs.c \ - compiler/radeon_variable.c \ - compiler/r3xx_fragprog.c \ - compiler/r300_fragprog.c \ - compiler/r300_fragprog_swizzle.c \ - compiler/r300_fragprog_emit.c \ - compiler/r500_fragprog.c \ - compiler/r500_fragprog_emit.c \ - compiler/r3xx_vertprog.c \ - compiler/r3xx_vertprog_dump.c \ - compiler/memory_pool.c \ - \ +# get C_SOURCES +include Makefile.sources + +# needed to build non-libmesagallium.a targets +C_SOURCES += \ $(TOP)/src/glsl/ralloc.c \ $(TOP)/src/mesa/program/register_allocate.c diff --git a/src/gallium/drivers/r300/Makefile.sources b/src/gallium/drivers/r300/Makefile.sources new file mode 100644 index 00000000000..90105d6e694 --- /dev/null +++ b/src/gallium/drivers/r300/Makefile.sources @@ -0,0 +1,57 @@ +C_SOURCES := \ + r300_blit.c \ + r300_chipset.c \ + r300_context.c \ + r300_debug.c \ + r300_emit.c \ + r300_flush.c \ + r300_fs.c \ + r300_hyperz.c \ + r300_query.c \ + r300_render.c \ + r300_render_stencilref.c \ + r300_render_translate.c \ + r300_resource.c \ + r300_screen.c \ + r300_screen_buffer.c \ + r300_state.c \ + r300_state_derived.c \ + r300_vs.c \ + r300_vs_draw.c \ + r300_texture.c \ + r300_texture_desc.c \ + r300_tgsi_to_rc.c \ + r300_transfer.c \ + \ + compiler/radeon_code.c \ + compiler/radeon_compiler.c \ + compiler/radeon_compiler_util.c \ + compiler/radeon_emulate_branches.c \ + compiler/radeon_emulate_loops.c \ + compiler/radeon_program.c \ + compiler/radeon_program_print.c \ + compiler/radeon_opcodes.c \ + compiler/radeon_program_alu.c \ + compiler/radeon_program_pair.c \ + compiler/radeon_program_tex.c \ + compiler/radeon_pair_translate.c \ + compiler/radeon_pair_schedule.c \ + compiler/radeon_pair_regalloc.c \ + compiler/radeon_pair_dead_sources.c \ + compiler/radeon_dataflow.c \ + compiler/radeon_dataflow_deadcode.c \ + compiler/radeon_dataflow_swizzles.c \ + compiler/radeon_list.c \ + compiler/radeon_optimize.c \ + compiler/radeon_remove_constants.c \ + compiler/radeon_rename_regs.c \ + compiler/radeon_variable.c \ + compiler/r3xx_fragprog.c \ + compiler/r300_fragprog.c \ + compiler/r300_fragprog_swizzle.c \ + compiler/r300_fragprog_emit.c \ + compiler/r500_fragprog.c \ + compiler/r500_fragprog_emit.c \ + compiler/r3xx_vertprog.c \ + compiler/r3xx_vertprog_dump.c \ + compiler/memory_pool.c diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript index 7ffd1c27c96..e6a05db64f1 100644 --- a/src/gallium/drivers/r300/SConscript +++ b/src/gallium/drivers/r300/SConscript @@ -10,62 +10,7 @@ env.Append(CPPPATH = [ r300 = env.ConvenienceLibrary( target = 'r300', - source = [ - 'r300_blit.c', - 'r300_chipset.c', - 'r300_context.c', - 'r300_debug.c', - 'r300_emit.c', - 'r300_flush.c', - 'r300_fs.c', - 'r300_hyperz.c', - 'r300_query.c', - 'r300_render.c', - 'r300_render_stencilref.c', - 'r300_render_translate.c', - 'r300_resource.c', - 'r300_screen.c', - 'r300_screen_buffer.c', - 'r300_state.c', - 'r300_state_derived.c', - 'r300_vs.c', - 'r300_vs_draw.c', - 'r300_texture.c', - 'r300_texture_desc.c', - 'r300_tgsi_to_rc.c', - 'r300_transfer.c', - 'compiler/radeon_code.c', - 'compiler/radeon_compiler.c', - 'compiler/radeon_compiler_util.c', - 'compiler/radeon_program.c', - 'compiler/radeon_program_print.c', - 'compiler/radeon_opcodes.c', - 'compiler/radeon_program_alu.c', - 'compiler/radeon_program_pair.c', - 'compiler/radeon_program_tex.c', - 'compiler/radeon_pair_translate.c', - 'compiler/radeon_pair_schedule.c', - 'compiler/radeon_pair_regalloc.c', - 'compiler/radeon_pair_dead_sources.c', - 'compiler/radeon_optimize.c', - 'compiler/radeon_remove_constants.c', - 'compiler/radeon_rename_regs.c', - 'compiler/radeon_emulate_branches.c', - 'compiler/radeon_emulate_loops.c', - 'compiler/radeon_dataflow.c', - 'compiler/radeon_dataflow_deadcode.c', - 'compiler/radeon_dataflow_swizzles.c', - 'compiler/radeon_variable.c', - 'compiler/radeon_list.c', - 'compiler/r3xx_fragprog.c', - 'compiler/r300_fragprog.c', - 'compiler/r300_fragprog_swizzle.c', - 'compiler/r300_fragprog_emit.c', - 'compiler/r500_fragprog.c', - 'compiler/r500_fragprog_emit.c', - 'compiler/r3xx_vertprog.c', - 'compiler/r3xx_vertprog_dump.c', - 'compiler/memory_pool.c', + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') + [ '#/src/glsl/ralloc.c', '#/src/mesa/program/register_allocate.c' ]) |