scons: Enable mesa state tracker in all platforms by default.
authorJosé Fonseca <jrfonseca@tungstengraphics.com>
Sat, 31 May 2008 09:55:25 +0000 (18:55 +0900)
committerJosé Fonseca <jrfonseca@tungstengraphics.com>
Sat, 31 May 2008 09:55:41 +0000 (18:55 +0900)
But only actually build it on some. This results in a better default
scons experience.

SConstruct
src/mesa/SConscript

index 5f7b6dd4d118444f273469e7af32ad71e68304bd..9c37b24f72c843f023b2fe7b4f2a69d8142e2d90 100644 (file)
@@ -30,14 +30,15 @@ import common
 # Configuration options
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_statetrackers = 'mesa'
+       default_statetrackers = 'all'
        default_drivers = 'softpipe,failover,i915simple,i965simple'
        default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-       default_statetrackers = 'none'
+       default_statetrackers = 'all'
        default_drivers = 'softpipe,i915simple'
        default_winsys = 'none'
 else:
+       default_statetrackers = 'all'
        default_drivers = 'all'
        default_winsys = 'all'
 
index 6b99dacf2a6e1b6f30711d2b1335959304e3b089..04b771a7e16e3af3c0787b8b4d49dcce29bb36f6 100644 (file)
 
 Import('*')
 
-env = env.Clone()
+if env['platform'] != 'winddk':
 
-# Includes
-env.Append(CPPPATH = [
-       '#/src/mesa',
-       '#/src/mesa/main',
-])
-
-if gcc:
-       env.Append(CFLAGS = [
-               '-std=c99',
-       ])
-
-# x86 assembly
-if x86 and gcc:
-       env.Append(CPPDEFINES = [
-               'USE_X86_ASM', 
-               'USE_MMX_ASM',
-               'USE_3DNOW_ASM',
-               'USE_SSE_ASM',
+       env = env.Clone()
+       
+       # Includes
+       env.Append(CPPPATH = [
+               '#/src/mesa',
+               '#/src/mesa/main',
        ])
-
-
-#######################################################################
-# Core sources
-
-MAIN_SOURCES = [
-       'main/api_arrayelt.c',
-       'main/api_loopback.c',
-       'main/api_noop.c',
-       'main/api_validate.c',
-       'main/accum.c',
-       'main/attrib.c',
-       'main/arrayobj.c',
-       'main/blend.c',
-       'main/bufferobj.c',
-       'main/buffers.c',
-       'main/clip.c',
-       'main/colortab.c',
-       'main/context.c',
-       'main/convolve.c',
-       'main/debug.c',
-       'main/depth.c',
-       'main/depthstencil.c',
-       'main/dlist.c',
-       'main/drawpix.c',
-       'main/enable.c',
-       'main/enums.c',
-       'main/eval.c',
-       'main/execmem.c',
-       'main/extensions.c',
-       'main/fbobject.c',
-       'main/feedback.c',
-       'main/ffvertex_prog.c',
-       'main/fog.c',
-       'main/framebuffer.c',
-       'main/get.c',
-       'main/getstring.c',
-       'main/hash.c',
-       'main/hint.c',
-       'main/histogram.c',
-       'main/image.c',
-       'main/imports.c',
-       'main/light.c',
-       'main/lines.c',
-       'main/matrix.c',
-       'main/mipmap.c',
-       'main/mm.c',
-       'main/pixel.c',
-       'main/points.c',
-       'main/polygon.c',
-       'main/queryobj.c',
-       'main/rastpos.c',
-       'main/rbadaptors.c',
-       'main/renderbuffer.c',
-       'main/shaders.c',
-       'main/state.c',
-       'main/stencil.c',
-       'main/texcompress.c',
-       'main/texcompress_s3tc.c',
-       'main/texcompress_fxt1.c',
-       'main/texenvprogram.c',
-       'main/texformat.c',
-       'main/teximage.c',
-       'main/texobj.c',
-       'main/texrender.c',
-       'main/texstate.c',
-       'main/texstore.c',
-       'main/varray.c',
-       'main/vtxfmt.c',
-]
-
-GLAPI_SOURCES = [
-       'main/dispatch.c',
-       'glapi/glapi.c',
-       'glapi/glthread.c',
-]
-
-MATH_SOURCES = [
-       'math/m_debug_clip.c',
-       'math/m_debug_norm.c',
-       'math/m_debug_xform.c',
-       'math/m_eval.c',
-       'math/m_matrix.c',
-       'math/m_translate.c',
-       'math/m_vector.c',
-       'math/m_xform.c',
-]
-
-VBO_SOURCES = [
-       'vbo/vbo_context.c',
-       'vbo/vbo_exec.c',
-       'vbo/vbo_exec_api.c',
-       'vbo/vbo_exec_array.c',
-       'vbo/vbo_exec_draw.c',
-       'vbo/vbo_exec_eval.c',
-       'vbo/vbo_rebase.c',
-       'vbo/vbo_split.c',
-       'vbo/vbo_split_copy.c',
-       'vbo/vbo_split_inplace.c',
-       'vbo/vbo_save.c',
-       'vbo/vbo_save_api.c',
-       'vbo/vbo_save_draw.c',
-       'vbo/vbo_save_loopback.c',
-]
-
-VF_SOURCES = [
-       'vf/vf.c',
-       'vf/vf_generic.c',
-       'vf/vf_sse.c',
-]
-
-STATETRACKER_SOURCES = [
-       'state_tracker/st_atom.c',
-       'state_tracker/st_atom_blend.c',
-       'state_tracker/st_atom_clip.c',
-       'state_tracker/st_atom_constbuf.c',
-       'state_tracker/st_atom_depth.c',
-       'state_tracker/st_atom_framebuffer.c',
-       'state_tracker/st_atom_pixeltransfer.c',
-       'state_tracker/st_atom_sampler.c',
-       'state_tracker/st_atom_scissor.c',
-       'state_tracker/st_atom_shader.c',
-       'state_tracker/st_atom_rasterizer.c',
-       'state_tracker/st_atom_stipple.c',
-       'state_tracker/st_atom_texture.c',
-       'state_tracker/st_atom_viewport.c',
-       'state_tracker/st_cb_accum.c',
-       'state_tracker/st_cb_bitmap.c',
-       'state_tracker/st_cb_blit.c',
-       'state_tracker/st_cb_bufferobjects.c',
-       'state_tracker/st_cb_clear.c',
-       'state_tracker/st_cb_flush.c',
-       'state_tracker/st_cb_drawpixels.c',
-       'state_tracker/st_cb_fbo.c',
-       'state_tracker/st_cb_feedback.c',
-       'state_tracker/st_cb_program.c',
-       'state_tracker/st_cb_queryobj.c',
-       'state_tracker/st_cb_rasterpos.c',
-       'state_tracker/st_cb_readpixels.c',
-       'state_tracker/st_cb_strings.c',
-       'state_tracker/st_cb_texture.c',
-       'state_tracker/st_context.c',
-       'state_tracker/st_debug.c',
-       'state_tracker/st_draw.c',
-       'state_tracker/st_extensions.c',
-       'state_tracker/st_format.c',
-       'state_tracker/st_framebuffer.c',
-       'state_tracker/st_gen_mipmap.c',
-       'state_tracker/st_mesa_to_tgsi.c',
-       'state_tracker/st_program.c',
-       'state_tracker/st_texture.c',
-]
-
-SHADER_SOURCES = [
-       'shader/arbprogparse.c',
-       'shader/arbprogram.c',
-       'shader/atifragshader.c',
-       'shader/grammar/grammar_mesa.c',
-       'shader/nvfragparse.c',
-       'shader/nvprogram.c',
-       'shader/nvvertparse.c',
-       'shader/program.c',
-       'shader/prog_cache.c',
-       'shader/prog_debug.c',
-       'shader/prog_execute.c',
-       'shader/prog_instruction.c',
-       'shader/prog_parameter.c',
-       'shader/prog_print.c',
-       'shader/prog_statevars.c',
-       'shader/prog_uniform.c',
-       'shader/programopt.c',
-       'shader/shader_api.c',
-]
-
-SLANG_SOURCES = [
-       'shader/slang/slang_builtin.c',
-       'shader/slang/slang_codegen.c',
-       'shader/slang/slang_compile.c',
-       'shader/slang/slang_compile_function.c',
-       'shader/slang/slang_compile_operation.c',
-       'shader/slang/slang_compile_struct.c',
-       'shader/slang/slang_compile_variable.c',
-       'shader/slang/slang_emit.c',
-       'shader/slang/slang_ir.c',
-       'shader/slang/slang_label.c',
-       'shader/slang/slang_library_noise.c',
-       'shader/slang/slang_link.c',
-       'shader/slang/slang_log.c',
-       'shader/slang/slang_mem.c',
-       'shader/slang/slang_preprocess.c',
-       'shader/slang/slang_print.c',
-       'shader/slang/slang_simplify.c',
-       'shader/slang/slang_storage.c',
-       'shader/slang/slang_typeinfo.c',
-       'shader/slang/slang_vartable.c',
-       'shader/slang/slang_utility.c',
-]
-
-
-#######################################################################
-# Assembly sources
-
-ASM_C_SOURCES = [
-       'x86/common_x86.c',
-       'x86/x86.c',
-       'x86/3dnow.c',
-       'x86/sse.c',
-       'sparc/sparc.c',
-       'ppc/common_ppc.c',
-       'x86-64/x86-64.c',
-]
-
-X86_SOURCES = [
-       'x86/common_x86_asm.S',
-       'x86/x86_xform2.S',
-       'x86/x86_xform3.S',
-       'x86/x86_xform4.S',
-       'x86/x86_cliptest.S',
-       'x86/mmx_blend.S',
-       'x86/3dnow_xform1.S',
-       'x86/3dnow_xform2.S',
-       'x86/3dnow_xform3.S',
-       'x86/3dnow_xform4.S',
-       'x86/3dnow_normal.S',
-       'x86/sse_xform1.S',
-       'x86/sse_xform2.S',
-       'x86/sse_xform3.S',
-       'x86/sse_xform4.S',
-       'x86/sse_normal.S',
-       'x86/read_rgba_span_x86.S',
-]
-
-X86_API = [
-       'x86/glapi_x86.S',
-]
-
-X86_64_SOURCES = [
-       'x86-64/xform4.S',
-]
-
-X86_64_API = [
-       'x86-64/glapi_x86-64.S',
-]
-
-SPARC_SOURCES = [
-       'sparc/clip.S',
-       'sparc/norm.S',
-       'sparc/xform.S',
-]
-
-SPARC_API = [
-       'sparc/glapi_sparc.S',
-]
-
-if x86 and gcc:
-       ASM_SOURCES = ASM_C_SOURCES + X86_SOURCES 
-       API_SOURCES = X86_API
-else:
-       ASM_SOURCES = []
-       API_SOURCES = []
-
-SOLO_SOURCES = \
-       MAIN_SOURCES + \
-       MATH_SOURCES + \
-       VBO_SOURCES + \
-       VF_SOURCES + \
-       STATETRACKER_SOURCES + \
-       SHADER_SOURCES + \
-       ASM_SOURCES + \
-       SLANG_SOURCES
-
-mesa = env.ConvenienceLibrary(
-       target = 'mesa',
-       source = SOLO_SOURCES,
-)
-Export('mesa')
-
-if not dri:
-       glapi = env.ConvenienceLibrary(
-               target = 'glapi',
-               source = GLAPI_SOURCES + API_SOURCES,
+       
+       if gcc:
+               env.Append(CFLAGS = [
+                       '-std=c99',
+               ])
+       
+       # x86 assembly
+       if x86 and gcc:
+               env.Append(CPPDEFINES = [
+                       'USE_X86_ASM', 
+                       'USE_MMX_ASM',
+                       'USE_3DNOW_ASM',
+                       'USE_SSE_ASM',
+               ])
+       
+       
+       #######################################################################
+       # Core sources
+       
+       MAIN_SOURCES = [
+               'main/api_arrayelt.c',
+               'main/api_loopback.c',
+               'main/api_noop.c',
+               'main/api_validate.c',
+               'main/accum.c',
+               'main/attrib.c',
+               'main/arrayobj.c',
+               'main/blend.c',
+               'main/bufferobj.c',
+               'main/buffers.c',
+               'main/clip.c',
+               'main/colortab.c',
+               'main/context.c',
+               'main/convolve.c',
+               'main/debug.c',
+               'main/depth.c',
+               'main/depthstencil.c',
+               'main/dlist.c',
+               'main/drawpix.c',
+               'main/enable.c',
+               'main/enums.c',
+               'main/eval.c',
+               'main/execmem.c',
+               'main/extensions.c',
+               'main/fbobject.c',
+               'main/feedback.c',
+               'main/ffvertex_prog.c',
+               'main/fog.c',
+               'main/framebuffer.c',
+               'main/get.c',
+               'main/getstring.c',
+               'main/hash.c',
+               'main/hint.c',
+               'main/histogram.c',
+               'main/image.c',
+               'main/imports.c',
+               'main/light.c',
+               'main/lines.c',
+               'main/matrix.c',
+               'main/mipmap.c',
+               'main/mm.c',
+               'main/pixel.c',
+               'main/points.c',
+               'main/polygon.c',
+               'main/queryobj.c',
+               'main/rastpos.c',
+               'main/rbadaptors.c',
+               'main/renderbuffer.c',
+               'main/shaders.c',
+               'main/state.c',
+               'main/stencil.c',
+               'main/texcompress.c',
+               'main/texcompress_s3tc.c',
+               'main/texcompress_fxt1.c',
+               'main/texenvprogram.c',
+               'main/texformat.c',
+               'main/teximage.c',
+               'main/texobj.c',
+               'main/texrender.c',
+               'main/texstate.c',
+               'main/texstore.c',
+               'main/varray.c',
+               'main/vtxfmt.c',
+       ]
+       
+       GLAPI_SOURCES = [
+               'main/dispatch.c',
+               'glapi/glapi.c',
+               'glapi/glthread.c',
+       ]
+       
+       MATH_SOURCES = [
+               'math/m_debug_clip.c',
+               'math/m_debug_norm.c',
+               'math/m_debug_xform.c',
+               'math/m_eval.c',
+               'math/m_matrix.c',
+               'math/m_translate.c',
+               'math/m_vector.c',
+               'math/m_xform.c',
+       ]
+       
+       VBO_SOURCES = [
+               'vbo/vbo_context.c',
+               'vbo/vbo_exec.c',
+               'vbo/vbo_exec_api.c',
+               'vbo/vbo_exec_array.c',
+               'vbo/vbo_exec_draw.c',
+               'vbo/vbo_exec_eval.c',
+               'vbo/vbo_rebase.c',
+               'vbo/vbo_split.c',
+               'vbo/vbo_split_copy.c',
+               'vbo/vbo_split_inplace.c',
+               'vbo/vbo_save.c',
+               'vbo/vbo_save_api.c',
+               'vbo/vbo_save_draw.c',
+               'vbo/vbo_save_loopback.c',
+       ]
+       
+       VF_SOURCES = [
+               'vf/vf.c',
+               'vf/vf_generic.c',
+               'vf/vf_sse.c',
+       ]
+       
+       STATETRACKER_SOURCES = [
+               'state_tracker/st_atom.c',
+               'state_tracker/st_atom_blend.c',
+               'state_tracker/st_atom_clip.c',
+               'state_tracker/st_atom_constbuf.c',
+               'state_tracker/st_atom_depth.c',
+               'state_tracker/st_atom_framebuffer.c',
+               'state_tracker/st_atom_pixeltransfer.c',
+               'state_tracker/st_atom_sampler.c',
+               'state_tracker/st_atom_scissor.c',
+               'state_tracker/st_atom_shader.c',
+               'state_tracker/st_atom_rasterizer.c',
+               'state_tracker/st_atom_stipple.c',
+               'state_tracker/st_atom_texture.c',
+               'state_tracker/st_atom_viewport.c',
+               'state_tracker/st_cb_accum.c',
+               'state_tracker/st_cb_bitmap.c',
+               'state_tracker/st_cb_blit.c',
+               'state_tracker/st_cb_bufferobjects.c',
+               'state_tracker/st_cb_clear.c',
+               'state_tracker/st_cb_flush.c',
+               'state_tracker/st_cb_drawpixels.c',
+               'state_tracker/st_cb_fbo.c',
+               'state_tracker/st_cb_feedback.c',
+               'state_tracker/st_cb_program.c',
+               'state_tracker/st_cb_queryobj.c',
+               'state_tracker/st_cb_rasterpos.c',
+               'state_tracker/st_cb_readpixels.c',
+               'state_tracker/st_cb_strings.c',
+               'state_tracker/st_cb_texture.c',
+               'state_tracker/st_context.c',
+               'state_tracker/st_debug.c',
+               'state_tracker/st_draw.c',
+               'state_tracker/st_extensions.c',
+               'state_tracker/st_format.c',
+               'state_tracker/st_framebuffer.c',
+               'state_tracker/st_gen_mipmap.c',
+               'state_tracker/st_mesa_to_tgsi.c',
+               'state_tracker/st_program.c',
+               'state_tracker/st_texture.c',
+       ]
+       
+       SHADER_SOURCES = [
+               'shader/arbprogparse.c',
+               'shader/arbprogram.c',
+               'shader/atifragshader.c',
+               'shader/grammar/grammar_mesa.c',
+               'shader/nvfragparse.c',
+               'shader/nvprogram.c',
+               'shader/nvvertparse.c',
+               'shader/program.c',
+               'shader/prog_cache.c',
+               'shader/prog_debug.c',
+               'shader/prog_execute.c',
+               'shader/prog_instruction.c',
+               'shader/prog_parameter.c',
+               'shader/prog_print.c',
+               'shader/prog_statevars.c',
+               'shader/prog_uniform.c',
+               'shader/programopt.c',
+               'shader/shader_api.c',
+       ]
+       
+       SLANG_SOURCES = [
+               'shader/slang/slang_builtin.c',
+               'shader/slang/slang_codegen.c',
+               'shader/slang/slang_compile.c',
+               'shader/slang/slang_compile_function.c',
+               'shader/slang/slang_compile_operation.c',
+               'shader/slang/slang_compile_struct.c',
+               'shader/slang/slang_compile_variable.c',
+               'shader/slang/slang_emit.c',
+               'shader/slang/slang_ir.c',
+               'shader/slang/slang_label.c',
+               'shader/slang/slang_library_noise.c',
+               'shader/slang/slang_link.c',
+               'shader/slang/slang_log.c',
+               'shader/slang/slang_mem.c',
+               'shader/slang/slang_preprocess.c',
+               'shader/slang/slang_print.c',
+               'shader/slang/slang_simplify.c',
+               'shader/slang/slang_storage.c',
+               'shader/slang/slang_typeinfo.c',
+               'shader/slang/slang_vartable.c',
+               'shader/slang/slang_utility.c',
+       ]
+       
+       
+       #######################################################################
+       # Assembly sources
+       
+       ASM_C_SOURCES = [
+               'x86/common_x86.c',
+               'x86/x86.c',
+               'x86/3dnow.c',
+               'x86/sse.c',
+               'sparc/sparc.c',
+               'ppc/common_ppc.c',
+               'x86-64/x86-64.c',
+       ]
+       
+       X86_SOURCES = [
+               'x86/common_x86_asm.S',
+               'x86/x86_xform2.S',
+               'x86/x86_xform3.S',
+               'x86/x86_xform4.S',
+               'x86/x86_cliptest.S',
+               'x86/mmx_blend.S',
+               'x86/3dnow_xform1.S',
+               'x86/3dnow_xform2.S',
+               'x86/3dnow_xform3.S',
+               'x86/3dnow_xform4.S',
+               'x86/3dnow_normal.S',
+               'x86/sse_xform1.S',
+               'x86/sse_xform2.S',
+               'x86/sse_xform3.S',
+               'x86/sse_xform4.S',
+               'x86/sse_normal.S',
+               'x86/read_rgba_span_x86.S',
+       ]
+       
+       X86_API = [
+               'x86/glapi_x86.S',
+       ]
+       
+       X86_64_SOURCES = [
+               'x86-64/xform4.S',
+       ]
+       
+       X86_64_API = [
+               'x86-64/glapi_x86-64.S',
+       ]
+       
+       SPARC_SOURCES = [
+               'sparc/clip.S',
+               'sparc/norm.S',
+               'sparc/xform.S',
+       ]
+       
+       SPARC_API = [
+               'sparc/glapi_sparc.S',
+       ]
+       
+       if x86 and gcc:
+               ASM_SOURCES = ASM_C_SOURCES + X86_SOURCES 
+               API_SOURCES = X86_API
+       else:
+               ASM_SOURCES = []
+               API_SOURCES = []
+       
+       SOLO_SOURCES = \
+               MAIN_SOURCES + \
+               MATH_SOURCES + \
+               VBO_SOURCES + \
+               VF_SOURCES + \
+               STATETRACKER_SOURCES + \
+               SHADER_SOURCES + \
+               ASM_SOURCES + \
+               SLANG_SOURCES
+       
+       mesa = env.ConvenienceLibrary(
+               target = 'mesa',
+               source = SOLO_SOURCES,
        )
-       Export('glapi')
+       Export('mesa')
+       
+       if not dri:
+               glapi = env.ConvenienceLibrary(
+                       target = 'glapi',
+                       source = GLAPI_SOURCES + API_SOURCES,
+               )
+               Export('glapi')