mesa: lift memcpy_get_tex_image() code from intel driver into core Mesa

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index dd0468fb93c355233a20558d2cac4f18a6c8ace1..309e0e54d0734e4664250a48efca50894a86b02a 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -12,6 +12,13 @@ if env['platform'] != 'winddk':
                '#/src/mesa',
        ])
        
+       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
        #
@@ -33,6 +40,7 @@ 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',
@@ -48,6 +56,7 @@ if env['platform'] != 'winddk':
                'main/feedback.c',
                'main/ffvertex_prog.c',
                'main/fog.c',
+               'main/formats.c',
                'main/framebuffer.c',
                'main/get.c',
                'main/getstring.c',
@@ -70,18 +79,23 @@ if env['platform'] != 'winddk':
                'main/rastpos.c',
                'main/rbadaptors.c',
                'main/readpix.c',
+               'main/remap.c',
                'main/renderbuffer.c',
                'main/scissor.c',
                'main/shaders.c',
+               'main/shared.c',
                'main/state.c',
                'main/stencil.c',
+               'main/syncobj.c',
                'main/texcompress.c',
                'main/texcompress_s3tc.c',
                'main/texcompress_fxt1.c',
                'main/texenv.c',
                'main/texenvprogram.c',
+               'main/texfetch.c',
                'main/texformat.c',
                'main/texgen.c',
+               'main/texgetimage.c',
                'main/teximage.c',
                'main/texobj.c',
                'main/texparam.c',
@@ -89,6 +103,7 @@ if env['platform'] != 'winddk':
                'main/texstate.c',
                'main/texstore.c',
                'main/varray.c',
+               'main/viewport.c',
                'main/vtxfmt.c',
        ]
        
@@ -157,6 +172,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',
@@ -175,20 +191,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',
        ]
        
@@ -244,7 +266,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',
@@ -335,5 +357,3 @@ if env['platform'] != 'winddk':
                )
                Export('glapi')
 
-       if platform == 'windows':
-               SConscript('state_tracker/wgl/SConscript')