diff options
| -rw-r--r-- | Filelist | 6 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 20 | ||||
| -rw-r--r-- | src/bigvim.bat | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 24 insertions, 8 deletions
@@ -349,6 +349,12 @@ SRC_DOS_BIN = \ src/vim*.ico \ src/vim.tlb \ src/vimtbar.lib \ + src/xpm/COPYRIGHT \ + src/xpm/README.txt \ + src/xpm/include/*.h \ + src/xpm/x64/lib/libXpm.lib \ + src/xpm/x86/lib/libXpm.a \ + src/xpm/x86/lib/libXpm.lib \ src/vimtbar.dll \ nsis/icons/*.bmp \ nsis/icons/*.ico \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 4dcbd90af..283f0d43c 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -89,6 +89,8 @@ # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) # # XPM Image Support: XPM=[path to XPM directory] +# Default is "xpm", using the files included in the distribution. +# Use "no" to disable this feature. # # Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED) # @@ -279,17 +281,21 @@ NBDEBUG_SRC = nbdebug.c NETBEANS_LIB = WSock32.lib !endif -!ifdef XPM +!ifndef XPM +# XPM is not set, use the included xpm files, depending on the architecture. +!if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64") +XPM = xpm\x64 +!else +XPM = xpm\x86 +!endif +!endif +!if "$(XPM)" != "no" # XPM - Include support for XPM signs -# You need to download or build xpm.lib somehow. -# You can get the most recent version of libXpm-*.zip from -# http://cgit.freedesktop.org/xorg/lib/libXpm -# from which you must build xpm.lib yourself -# OR get and unpack: ftp://ftp.vim.org/pub/vim/pcextra/xpm.zip +# See the xpm directory for more information. XPM_OBJ = $(OBJDIR)/xpm_w32.obj XPM_DEFS = -DFEAT_XPM_W32 XPM_LIB = $(XPM)\lib\libXpm.lib -XPM_INC = -I $(XPM)\include +XPM_INC = -I $(XPM)\include -I $(XPM)\..\include !endif !endif diff --git a/src/bigvim.bat b/src/bigvim.bat index 6ba89e62c..a1c9783bd 100644 --- a/src/bigvim.bat +++ b/src/bigvim.bat @@ -1,3 +1,5 @@ :: command to build big Vim with OLE, Perl, Python, Ruby and Tcl -nmake -f Make_mvc.mak GUI=yes OLE=yes PERL=E:\perl512 DYNAMIC_PERL=yes PERL_VER=512 PYTHON=e:\python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=e:\python31 DYNAMIC_PYTHON3=yes PYTHON3_VER=31 RUBY=e:\ruby191 DYNAMIC_RUBY=yes RUBY_VER=191 RUBY_VER_LONG=1.9.1 TCL=e:\tcl DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes XPM=e:\xpm +SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\" +SET TOOLDIR=E:\ +%VCDIR%nmake -f Make_mvc.mak GUI=yes OLE=yes PERL=E:\perl514 DYNAMIC_PERL=yes PERL_VER=514 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python32 DYNAMIC_PYTHON3=yes PYTHON3_VER=32 RUBY=%TOOLDIR%ruby192 DYNAMIC_RUBY=yes RUBY_VER=192 RUBY_VER_LONG=1.9.2 TCL=%TOOLDIR%tcl TCL_VER=85 TCL_VER_LONG=8.5 DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes diff --git a/src/version.c b/src/version.c index a98779d73..c3dcff189 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 639, +/**/ 638, /**/ 637, |