R1xx/r2xx: Don't use an alpha texture format for GLX_TEXTURE_FORMAT_RGB_EXT

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 21c98301d7d0973cd28fa136fd9f19bf2b255c9e..9ffc15eeb7bf3d187d377e73c58026fbf2da1097 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -16,6 +16,7 @@ if env['platform'] != 'winddk':
                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
                ])       
 
        #
@@ -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',
        ]
        
@@ -162,6 +168,7 @@ 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',
@@ -185,9 +192,10 @@ if env['platform'] != 'winddk':
                'shader/nvvertparse.c',
                'shader/program.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_print.c',
                'shader/prog_statevars.c',
@@ -207,7 +215,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',
@@ -249,7 +256,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',
@@ -285,6 +292,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',
                ]
@@ -336,5 +347,3 @@ if env['platform'] != 'winddk':
                )
                Export('glapi')
 
-       if platform == 'windows':
-               SConscript('state_tracker/wgl/SConscript')