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 | 68c1ac94cf07575a421cc397d72398ac80649234 (patch) | |
| tree | 193bfd4a9f60eb443079529ed6d39a8db220d313 | |
| parent | 7e601b26b2bd2b8ed0afd5580ef62ecfba2aa318 (diff) | |
| download | vim-68c1ac94cf07575a421cc397d72398ac80649234.tar.gz | |
Problem: Can't compile with MSVC with pentium4 and 64 bit.
Solution: Only use SSE2 for 32 bit. (Mike Williams)
| -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 7b562438..88f092bf 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 65de7c9e..d3c2421b 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, |