Mercurial > vim
diff src/Make_mvc.mak @ 3790:fd0c7452fa51 v7.3.653
updated for version 7.3.653
Problem: MingW needs build rule for included XPM files. Object directory
for 32 and 64 builds is the same, also for MSVC.
Solution: Add MingW build rule to use included XPM files. Add the CPU or
architecture to the object directory name. (Sergey Khorev)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 05 Sep 2012 17:57:39 +0200 |
| parents | 1ec385a8faf4 |
| children | 35939e1e25ff |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -213,6 +213,7 @@ CPU = i386 # We're on Windows 95 CPU = i386 !endif # !PROCESSOR_ARCHITECTURE +OBJDIR = $(OBJDIR)$(CPU) # Build a retail version by default @@ -283,10 +284,12 @@ NETBEANS_LIB = WSock32.lib !ifndef XPM # XPM is not set, use the included xpm files, depending on the architecture. -!if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64") +!if "$(CPU)" == "AMD64" XPM = xpm\x64 +!elseif "$(CPU)" == "i386" +XPM = xpm\x86 !else -XPM = xpm\x86 +XPM = no !endif !endif !if "$(XPM)" != "no"