summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-02-29 16:56:39 +0100
committerBram Moolenaar <bram@vim.org>2012-02-29 16:56:39 +0100
commitc708692026052de071f6de124a50e2d37a76b852 (patch)
tree44d1e6647dd3e37d57e82a92a492445e8f49979e
parentc1ce91994660446fe7470289c0e7c7262a9cd081 (diff)
downloadvim-c708692026052de071f6de124a50e2d37a76b852.tar.gz
updated for version 7.3.460v7.3.460v7-3-460
Problem: Win32: UPX does not compress 64 bit binaries. Solution: Mention and add the alternative: mpress. (Dave Bodenstab)
-rw-r--r--src/INSTALLpc.txt6
-rw-r--r--src/Make_ming.mak10
-rw-r--r--src/version.c2
3 files changed, 16 insertions, 2 deletions
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index ec358e02..66f102d1 100644
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -239,6 +239,12 @@ If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX'
found at
http://www.upx.org/
+As of 2011, UPX still does not support compressing 64-bit EXE's; if you have
+built a 64-bit vim then an alternative to UPX is 'MPRESS'. MPRESS can be found
+at:
+ http://www.matcode.com/mpress.htm
+
+
ADDITION: NLS support with MinGW
(by Eduardo F. Amatria <eferna1@platea.pntic.mec.es>)
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index bacdb04c..64c3db83 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -14,9 +14,11 @@
# it's just run out of memory or something. Run again, and it will continue
# with 'xxd'.
#
-# "make upx" makes *compressed* versions of the GUI and console EXEs, using the
-# excellent UPX compressor:
+# "make upx" makes *compressed* versions of the 32 bit GUI and console EXEs,
+# using the excellent UPX compressor:
# http://upx.sourceforge.net/
+# "make mpress" uses the MPRESS compressor for 32- and 64-bit EXEs:
+# http://www.matcode.com/mpress.htm
#
# Maintained by Ron Aaron <ronaharon@yahoo.com>
# updated 2003 Jan 20
@@ -640,6 +642,10 @@ upx: exes
upx gvim.exe
upx vim.exe
+mpress: exes
+ mpress gvim.exe
+ mpress vim.exe
+
xxd/xxd.exe: xxd/xxd.c
$(MAKE) -C xxd -f Make_ming.mak CC=$(CC)
diff --git a/src/version.c b/src/version.c
index 3c8101bc..7fbadcda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 460,
+/**/
459,
/**/
458,