From 91856270dfbf7a042e2869bc44c9c7b217852f40 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 29 Feb 2012 16:56:39 +0100
Subject: [PATCH] updated for version 7.3.460 Problem: Win32: UPX does not
compress 64 bit binaries. Solution: Mention and add the alternative:
mpress. (Dave Bodenstab)
---
src/INSTALLpc.txt | 6 ++++++
src/Make_ming.mak | 10 ++++++++--
src/version.c | 2 ++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index ec358e027e..66f102d126 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 bacdb04c7d..64c3db8349 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 3c8101bc61..7fbadcdae6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 460,
/**/
459,
/**/
--
GitLab