Mercurial > vim

comparison src/Make_mvc.mak @ 3762:1ec385a8faf4 v7.3.639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.639 Problem: It's not easy to build Vim on Windows with XPM support. Solution: Include the required files, they are quite small. Update the MSVC makefile to use them. Binary files are in the next patch. (Sergey Khorev)
author Bram Moolenaar <bram@vim.org>
date Wed, 29 Aug 2012 14:18:33 +0200
parents 52247eb61511
children fd0c7452fa51
comparison
equal deleted inserted replaced
3761:8187706695fc 3762:1ec385a8faf4
87 # PostScript printing: POSTSCRIPT=yes (default is no) 87 # PostScript printing: POSTSCRIPT=yes (default is no)
88 # 88 #
89 # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) 89 # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes)
90 # 90 #
91 # XPM Image Support: XPM=[path to XPM directory] 91 # XPM Image Support: XPM=[path to XPM directory]
92 # Default is "xpm", using the files included in the distribution.
93 # Use "no" to disable this feature.
92 # 94 #
93 # Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED) 95 # Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED)
94 # 96 #
95 # Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is 97 # Processor Version: CPUNR=[i386, i486, i586, i686, pentium4] (default is
96 # i386) 98 # i386)
277 NBDEBUG_SRC = nbdebug.c 279 NBDEBUG_SRC = nbdebug.c
278 !endif 280 !endif
279 NETBEANS_LIB = WSock32.lib 281 NETBEANS_LIB = WSock32.lib
280 !endif 282 !endif
281 283
282 !ifdef XPM 284 !ifndef XPM
285 # XPM is not set, use the included xpm files, depending on the architecture.
286 !if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64")
287 XPM = xpm\x64
288 !else
289 XPM = xpm\x86
290 !endif
291 !endif
292 !if "$(XPM)" != "no"
283 # XPM - Include support for XPM signs 293 # XPM - Include support for XPM signs
284 # You need to download or build xpm.lib somehow. 294 # See the xpm directory for more information.
285 # You can get the most recent version of libXpm-*.zip from
286 # http://cgit.freedesktop.org/xorg/lib/libXpm
287 # from which you must build xpm.lib yourself
288 # OR get and unpack: ftp://ftp.vim.org/pub/vim/pcextra/xpm.zip
289 XPM_OBJ = $(OBJDIR)/xpm_w32.obj 295 XPM_OBJ = $(OBJDIR)/xpm_w32.obj
290 XPM_DEFS = -DFEAT_XPM_W32 296 XPM_DEFS = -DFEAT_XPM_W32
291 XPM_LIB = $(XPM)\lib\libXpm.lib 297 XPM_LIB = $(XPM)\lib\libXpm.lib
292 XPM_INC = -I $(XPM)\include 298 XPM_INC = -I $(XPM)\include -I $(XPM)\..\include
293 !endif 299 !endif
294 !endif 300 !endif
295 301
296 # Set which version of the CRT to use 302 # Set which version of the CRT to use
297 !if defined(USE_MSVCRT) 303 !if defined(USE_MSVCRT)