projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nuke s3v.
[mesa.git]
/
src
/
mesa
/
SConscript
diff --git
a/src/mesa/SConscript
b/src/mesa/SConscript
index a878d31dbb5129c3532f88ca43e799c487915f33..cad56763208de6e46c9903e2d0223b52f1aad470 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
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,6
+40,7
@@
if env['platform'] != 'winddk':
'main/colortab.c',
'main/context.c',
'main/convolve.c',
'main/colortab.c',
'main/context.c',
'main/convolve.c',
+ 'main/cpuinfo.c',
'main/debug.c',
'main/depth.c',
'main/depthstencil.c',
'main/debug.c',
'main/depth.c',
'main/depthstencil.c',
@@
-79,8
+81,10
@@
if env['platform'] != 'winddk':
'main/renderbuffer.c',
'main/scissor.c',
'main/shaders.c',
'main/renderbuffer.c',
'main/scissor.c',
'main/shaders.c',
+ 'main/shared.c',
'main/state.c',
'main/stencil.c',
'main/state.c',
'main/stencil.c',
+ 'main/syncobj.c',
'main/texcompress.c',
'main/texcompress_s3tc.c',
'main/texcompress_fxt1.c',
'main/texcompress.c',
'main/texcompress_s3tc.c',
'main/texcompress_fxt1.c',
@@
-88,6
+92,7
@@
if env['platform'] != 'winddk':
'main/texenvprogram.c',
'main/texformat.c',
'main/texgen.c',
'main/texenvprogram.c',
'main/texformat.c',
'main/texgen.c',
+ 'main/texgetimage.c',
'main/teximage.c',
'main/texobj.c',
'main/texparam.c',
'main/teximage.c',
'main/texobj.c',
'main/texparam.c',
@@
-95,6
+100,7
@@
if env['platform'] != 'winddk':
'main/texstate.c',
'main/texstore.c',
'main/varray.c',
'main/texstate.c',
'main/texstore.c',
'main/varray.c',
+ 'main/viewport.c',
'main/vtxfmt.c',
]
'main/vtxfmt.c',
]
@@
-163,6
+169,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_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_context.c',
'state_tracker/st_debug.c',
'state_tracker/st_draw.c',
@@
-181,20
+188,26
@@
if env['platform'] != 'winddk':
'shader/arbprogram.c',
'shader/atifragshader.c',
'shader/grammar/grammar_mesa.c',
'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/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_cache.c',
- 'shader/prog_debug.c',
'shader/prog_execute.c',
'shader/prog_instruction.c',
'shader/prog_noise.c',
'shader/prog_execute.c',
'shader/prog_instruction.c',
'shader/prog_noise.c',
+ 'shader/prog_optimize.c',
'shader/prog_parameter.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/prog_print.c',
'shader/prog_statevars.c',
'shader/prog_uniform.c',
'shader/programopt.c',
+ 'shader/symbol_table.c',
'shader/shader_api.c',
]
'shader/shader_api.c',
]
@@
-250,7
+263,7
@@
if env['platform'] != 'winddk':
])
mesa_sources += [
'x86/common_x86.c',
])
mesa_sources += [
'x86/common_x86.c',
- 'x86/x86.c',
+ 'x86/x86
_xform
.c',
'x86/3dnow.c',
'x86/sse.c',
'x86/common_x86_asm.S',
'x86/3dnow.c',
'x86/sse.c',
'x86/common_x86_asm.S',