diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-03-29 12:57:28 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-03-29 13:04:53 (GMT) |
| commit | 182394008e63b1a977b5f6edd3d8c129fe2dce34 (patch) | |
| tree | 29d567445faa120cd96b3bfe2967f75b1e7c75da /src/nsis-1-fixes.patch | |
| parent | a8df43d1324294522bde66f2c5d5f9f6d43476e6 (diff) | |
| download | mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.zip mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.gz mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.bz2 | |
mingw-w64: fix the shlobj.h problem at the source
Diffstat (limited to 'src/nsis-1-fixes.patch')
| -rw-r--r-- | src/nsis-1-fixes.patch | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index ac1bee8..ce53524 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -4,7 +4,7 @@ See index.html for further information. From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 12 Aug 2012 12:33:26 +0200 -Subject: [PATCH 1/5] explicit mingw cross prefix +Subject: [PATCH 1/4] explicit mingw cross prefix This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 @@ -51,7 +51,7 @@ index 80872bc..4f113dd 100755 From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001 From: freeman <free.man.uu@gmail.com> Date: Sun, 12 Aug 2012 12:36:39 +0200 -Subject: [PATCH 2/5] add missing header +Subject: [PATCH 2/4] add missing header diff --git a/Source/util.h b/Source/util.h @@ -73,7 +73,7 @@ index 4259a6a..664923e 100755 From 9a40694c9177db6fa5db3f28d7d68c042d0a6144 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Fri, 3 May 2013 17:28:44 +1000 -Subject: [PATCH 3/5] Enable native 64-bit build +Subject: [PATCH 3/4] Enable native 64-bit build Taken from: http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD @@ -588,7 +588,7 @@ index 2c0b07f..18c31a2 100755 From eb6e12dd7173f4c259fd31c9074b0c95bc567487 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 9 May 2013 13:08:59 +1000 -Subject: [PATCH 4/5] i686-w64-mingw32 fixes +Subject: [PATCH 4/4] i686-w64-mingw32 fixes diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp @@ -775,24 +775,3 @@ index 18c31a2..fc9443f 100755 2.1.0 -From 5a88cf1c8a78d9e627e6ee259ea0c09af712aac0 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 29 Mar 2015 09:32:40 +0200 -Subject: [PATCH 5/5] add missing include - - -diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c -index 7fe32ac..952b87e 100755 ---- a/Source/exehead/Ui.c -+++ b/Source/exehead/Ui.c -@@ -14,6 +14,7 @@ - * warranty. - */ - -+#include <windows.h> - #include <windowsx.h> - #include <shlobj.h> - #include <shellapi.h> --- -2.1.0 - |