Mercurial > vim

comparison src/Make_mvc.mak @ 3790:fd0c7452fa51 v7.3.653

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3789:ff2b3113f0bf 3790:fd0c7452fa51
211 ! endif 211 ! endif
212 !else # !PROCESSOR_ARCHITECTURE 212 !else # !PROCESSOR_ARCHITECTURE
213 # We're on Windows 95 213 # We're on Windows 95
214 CPU = i386 214 CPU = i386
215 !endif # !PROCESSOR_ARCHITECTURE 215 !endif # !PROCESSOR_ARCHITECTURE
216 OBJDIR = $(OBJDIR)$(CPU)
216 217
217 # Build a retail version by default 218 # Build a retail version by default
218 219
219 !if "$(DEBUG)" != "yes" 220 !if "$(DEBUG)" != "yes"
220 NODEBUG = 1 221 NODEBUG = 1
281 NETBEANS_LIB = WSock32.lib 282 NETBEANS_LIB = WSock32.lib
282 !endif 283 !endif
283 284
284 !ifndef XPM 285 !ifndef XPM
285 # XPM is not set, use the included xpm files, depending on the architecture. 286 # XPM is not set, use the included xpm files, depending on the architecture.
286 !if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64") 287 !if "$(CPU)" == "AMD64"
287 XPM = xpm\x64 288 XPM = xpm\x64
288 !else 289 !elseif "$(CPU)" == "i386"
289 XPM = xpm\x86 290 XPM = xpm\x86
291 !else
292 XPM = no
290 !endif 293 !endif
291 !endif 294 !endif
292 !if "$(XPM)" != "no" 295 !if "$(XPM)" != "no"
293 # XPM - Include support for XPM signs 296 # XPM - Include support for XPM signs
294 # See the xpm directory for more information. 297 # See the xpm directory for more information.