mesa: Update sconscript for new ARB/FP assembler.

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index d2de189f6907fc81c3d1ec29b3262e0358f8e083..6617c9dbe54bfd88623bf311e080a1c77cc44789 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -10,13 +10,14 @@ if env['platform'] != 'winddk':
        
        env.Append(CPPPATH = [
                '#/src/mesa',
-               '#/src/mesa/main',
        ])
        
-       if gcc:
-               env.Append(CFLAGS = [
-                       '-std=c99',
-               ])
+       if env['platform'] == 'windows':
+               env.Append(CPPDEFINES = [
+                       '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+                       'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
+                       'WIN32_THREADS', # use Win32 thread API
+               ])       
 
        #
        # Source files
@@ -39,10 +40,12 @@ if env['platform'] != 'winddk':
                'main/colortab.c',
                'main/context.c',
                'main/convolve.c',
+               'main/cpuinfo.c',
                'main/debug.c',
                'main/depth.c',
                'main/depthstencil.c',
                'main/dlist.c',
+               'main/dlopen.c',
                'main/drawpix.c',
                'main/enable.c',
                'main/enums.c',
@@ -78,6 +81,7 @@ if env['platform'] != 'winddk':
                'main/renderbuffer.c',
                'main/scissor.c',
                'main/shaders.c',
+               'main/shared.c',
                'main/state.c',
                'main/stencil.c',
                'main/texcompress.c',
@@ -87,6 +91,7 @@ if env['platform'] != 'winddk':
                'main/texenvprogram.c',
                'main/texformat.c',
                'main/texgen.c',
+               'main/texgetimage.c',
                'main/teximage.c',
                'main/texobj.c',
                'main/texparam.c',
@@ -94,6 +99,7 @@ if env['platform'] != 'winddk':
                'main/texstate.c',
                'main/texstore.c',
                'main/varray.c',
+               'main/viewport.c',
                'main/vtxfmt.c',
        ]
        
@@ -154,6 +160,7 @@ if env['platform'] != 'winddk':
                'state_tracker/st_cb_flush.c',
                'state_tracker/st_cb_drawpixels.c',
                'state_tracker/st_cb_fbo.c',
+               'state_tracker/st_cb_get.c',
                'state_tracker/st_cb_feedback.c',
                'state_tracker/st_cb_program.c',
                'state_tracker/st_cb_queryobj.c',
@@ -161,9 +168,11 @@ if env['platform'] != 'winddk':
                'state_tracker/st_cb_readpixels.c',
                'state_tracker/st_cb_strings.c',
                'state_tracker/st_cb_texture.c',
+               'state_tracker/st_cb_viewport.c',
                'state_tracker/st_context.c',
                'state_tracker/st_debug.c',
                'state_tracker/st_draw.c',
+               'state_tracker/st_draw_feedback.c',
                'state_tracker/st_extensions.c',
                'state_tracker/st_format.c',
                'state_tracker/st_framebuffer.c',
@@ -178,19 +187,26 @@ if env['platform'] != 'winddk':
                'shader/arbprogram.c',
                'shader/atifragshader.c',
                'shader/grammar/grammar_mesa.c',
+               'shader/hash_table.c',
+               'shader/lex.yy.c',
                'shader/nvfragparse.c',
                'shader/nvprogram.c',
                'shader/nvvertparse.c',
                'shader/program.c',
+               'shader/program_parse.tab.c',
+               'shader/program_parse_extra.c',
                'shader/prog_cache.c',
-               'shader/prog_debug.c',
                'shader/prog_execute.c',
                'shader/prog_instruction.c',
+               'shader/prog_noise.c',
+               'shader/prog_optimize.c',
                'shader/prog_parameter.c',
+               'shader/prog_parameter_layout.c',
                'shader/prog_print.c',
                'shader/prog_statevars.c',
                'shader/prog_uniform.c',
                'shader/programopt.c',
+               'shader/symbol_table.c',
                'shader/shader_api.c',
        ]
        
@@ -205,7 +221,6 @@ if env['platform'] != 'winddk':
                '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',
@@ -247,7 +262,7 @@ if env['platform'] != 'winddk':
                ])
                mesa_sources += [
                        'x86/common_x86.c',
-                       'x86/x86.c',
+                       'x86/x86_xform.c',
                        'x86/3dnow.c',
                        'x86/sse.c',
                        'x86/common_x86_asm.S',
@@ -283,6 +298,10 @@ if env['platform'] != 'winddk':
                        'x86-64/glapi_x86-64.S'
                ]
        elif gcc and env['machine'] == 'ppc':
+               env.Append(CPPDEFINES = [
+                       'USE_PPC_ASM', 
+                       'USE_VMX_ASM', 
+               ])
                mesa_sources += [
                        'ppc/common_ppc.c',
                ]
@@ -333,3 +352,4 @@ if env['platform'] != 'winddk':
                        source = glapi_sources,
                )
                Export('glapi')
+