diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-24 08:54:37 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-24 08:54:37 -0600 |
| commit | a04af335a42ce3b28e59ff9b85b2bd433a9d7b12 (patch) | |
| tree | 768262f4e8e4a9f49c64b76882c48f1ede445dd5 /scons | |
| parent | d60b2c68552a2729dfdb33c2bac4822453cf8ae2 (diff) | |
| parent | c25534f30d326c15dff845775d9bd55ba6064049 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/drivers/dri/i915/i915_tex_layout.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c
src/mesa/main/enums.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/crossmingw.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scons/crossmingw.py b/scons/crossmingw.py index bf81f16fd6..3aed484350 100644 --- a/scons/crossmingw.py +++ b/scons/crossmingw.py @@ -108,7 +108,7 @@ def shlib_emitter(target, source, env): return (target, source) -shlib_action = SCons.Action.Action(shlib_generator, generator=1) +shlib_action = SCons.Action.Action(shlib_generator, '$SHLINKCOMSTR', generator=1) res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR') |