Mercurial > vim

comparison src/Make_mvc.mak @ 7324:a3b8a63c88ef v7.4.967

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/6b90351786eb0915336b576cc930300bf5c9ac63 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 11 19:38:44 2015 +0100 patch 7.4.967 Problem: Cross compilation on MS-windows doesn't work well. Solution: Tidy up cross compilation across architectures with Visual Studio. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Fri, 11 Dec 2015 19:45:04 +0100
parents c412b0922c27
children d467ca80d3c1
comparison
equal deleted inserted replaced
7323:097a37c66c5c 7324:a3b8a63c88ef
209 !ifdef PROCESSOR_ARCHITECTURE 209 !ifdef PROCESSOR_ARCHITECTURE
210 # We're on Windows NT or using VC 6+ 210 # We're on Windows NT or using VC 6+
211 ! ifdef CPU 211 ! ifdef CPU
212 ASSEMBLY_ARCHITECTURE=$(CPU) 212 ASSEMBLY_ARCHITECTURE=$(CPU)
213 # Using I386 for $ASSEMBLY_ARCHITECTURE doesn't work for VC7. 213 # Using I386 for $ASSEMBLY_ARCHITECTURE doesn't work for VC7.
214 ! if ("$(ASSEMBLY_ARCHITECTURE)" == "i386") || ("$(ASSEMBLY_ARCHITECTURE)" == "I386") 214 ! if "$(CPU)" == "I386"
215 ASSEMBLY_ARCHITECTURE = x86
216 ! endif
217 ! else
218 CPU = $(PROCESSOR_ARCHITECTURE)
219 ASSEMBLY_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
220 ! if ("$(CPU)" == "x86") || ("$(CPU)" == "X86")
221 CPU = i386 215 CPU = i386
222 ! endif 216 ! endif
217 ! else # !CPU
218 CPU = i386
219 ! ifdef PLATFORM
220 ! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
221 CPU = AMD64
222 ! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
223 ! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
224 ! endif
225 ! endif # !PLATFORM
223 ! endif 226 ! endif
224 !else # !PROCESSOR_ARCHITECTURE 227 !else # !PROCESSOR_ARCHITECTURE
225 # We're on Windows 95 228 # We're on Windows 95
226 CPU = i386 229 CPU = i386
227 !endif # !PROCESSOR_ARCHITECTURE 230 !endif # !PROCESSOR_ARCHITECTURE
231 ASSEMBLY_ARCHITECTURE=$(CPU)
228 OBJDIR = $(OBJDIR)$(CPU) 232 OBJDIR = $(OBJDIR)$(CPU)
229 233
230 # Build a retail version by default 234 # Build a retail version by default
231 235
232 !if "$(DEBUG)" != "yes" 236 !if "$(DEBUG)" != "yes"
413 !else 417 !else
414 CPUARG = 418 CPUARG =
415 !endif 419 !endif
416 !else 420 !else
417 # VC8/9/10 only allows specifying SSE architecture but only for 32bit 421 # VC8/9/10 only allows specifying SSE architecture but only for 32bit
418 !if "$(ASSEMBLY_ARCHITECTURE)" == "x86" && "$(CPUNR)" == "pentium4" 422 !if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && "$(CPUNR)" == "pentium4"
419 CPUARG = /arch:SSE2 423 CPUARG = /arch:SSE2
420 !endif 424 !endif
421 !endif 425 !endif
422 426
423 LIBC = 427 LIBC =