diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:03:42 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:09:42 -0700 |
| commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
| tree | 847d1763b54772d336a04e606f8248291c3092b7 /scons/crossmingw.py | |
| parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
| parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) | |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'scons/crossmingw.py')
| -rw-r--r-- | scons/crossmingw.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/crossmingw.py b/scons/crossmingw.py index 8adc8f5c97..8af0d93f01 100644 --- a/scons/crossmingw.py +++ b/scons/crossmingw.py @@ -54,11 +54,13 @@ prefixes32 = SCons.Util.Split(""" i586-mingw32msvc- i686-mingw32msvc- i686-pc-mingw32- + i686-w64-mingw32- """) prefixes64 = SCons.Util.Split(""" amd64-mingw32- amd64-mingw32msvc- amd64-pc-mingw32- + x86_64-w64-mingw32- """) def find(env): |