Mercurial > gub
changeset 6295:375b18ad067a
Fix nsis min macro
| author | Masamichi Hosoda <trueroad@users.noreply.github.com> |
|---|---|
| date | Sun, 28 Dec 2014 01:25:09 +0900 |
| parents | 42ff97e65b36 |
| children | 397e0ac183ea |
| files | gub/specs/nsis.py patches/nsis-2.46-InstallOptions.patch |
| diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/nsis.py Sat Dec 27 17:17:44 2014 +0900 +++ b/gub/specs/nsis.py Sun Dec 28 01:25:09 2014 +0900 @@ -13,6 +13,7 @@ 'nsis-2.46-util.patch', 'nsis-2.46-linker_script-default.patch', 'nsis-2.46-linker_script-ndata.patch', + 'nsis-2.46-InstallOptions.patch', ] scons_flags = misc.join_lines (''' DEBUG=yes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/nsis-2.46-InstallOptions.patch Sun Dec 28 01:25:09 2014 +0900 @@ -0,0 +1,14 @@ +--- a/Contrib/InstallOptions/InstallerOptions.cpp 2014-12-28 01:11:11.671260400 +0900 ++++ b/Contrib/InstallOptions/InstallerOptions.cpp 2014-12-28 01:13:29.411260400 +0900 +@@ -16,6 +16,11 @@ + + #include <nsis/pluginapi.h> // nsis plugin + ++// for mingw-w64 headers ++#ifndef min ++#define min(a, b) (((a) < (b)) ? (a) : (b)) ++#endif ++ + // Use for functions only called from one place to possibly reduce some code + // size. Allows the source code to remain readable by leaving the function + // intact.