summaryrefslogtreecommitdiff
path: root/scons/crossmingw.py
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-07-15 14:17:07 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-07-15 14:17:07 -0400
commitc5c19919ce627b98d8aab4284da1694573bcccd4 (patch)
tree2e29b313b79b6a392e020fd5723e3cc00c800fd2 /scons/crossmingw.py
parenta0d4a12614fce072fa1eb5516e626909171c95e1 (diff)
parent3a3b83e5112b725e22f05b32a273a2351b820944 (diff)
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to the drawable being null.
Diffstat (limited to 'scons/crossmingw.py')
-rw-r--r--scons/crossmingw.py2
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')