diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-09-05 17:57:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-09-05 17:57:39 +0200 |
| commit | e2db4361d2236b1bf56fb436d274c8b9b361196c (patch) | |
| tree | 212441ab359c1087ef6416ba2233a8c122035e25 /src/Make_mvc.mak | |
| parent | ac0ddc15e928bb2c9baf256e0cd073770512092f (diff) | |
updated for version 7.3.653v7.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)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 283f0d43c4..20b306d19c 100644 --- 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 -!else +!elseif "$(CPU)" == "i386" XPM = xpm\x86 +!else +XPM = no !endif !endif !if "$(XPM)" != "no" |