diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-06-12 20:31:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-06-12 20:31:31 +0200 |
| commit | 3ed16dc6b71131f9a5808c066335617f5b6416e0 (patch) | |
| tree | cb083649ff82575b4bf502123cf025660aec0e2f /src | |
| parent | 7154b326d0aa1542d10d54278edc6af1fe57ac5d (diff) | |
| download | vim-git-3ed16dc6b71131f9a5808c066335617f5b6416e0.tar.gz | |
updated for version 7.3.207v7.3.207
Problem: Can't compile with MSVC with pentium4 and 64 bit.
Solution: Only use SSE2 for 32 bit. (Mike Williams)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_mvc.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 7b5624383..88f092bfa 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -409,8 +409,8 @@ CPUARG = /G7 /arch:SSE2 CPUARG = !endif !else -# VC8/9 only allows specifying SSE architecture -!if "$(CPUNR)" == "pentium4" +# VC8/9/10 only allows specifying SSE architecture but only for 32bit +!if "$(ASSEMBLY_ARCHITECTURE)" == "x86" && "$(CPUNR)" == "pentium4" CPUARG = /arch:SSE2 !endif !endif diff --git a/src/version.c b/src/version.c index 65de7c9e5..d3c2421b9 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 207, +/**/ 206, /**/ 205, |