Mercurial > mxe-octave

changeset 4608:dac40a0ff814

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: update for 64bit compile * src/nsis.mk: use sed to change default target stype in makensis, set target options to amd64 in 64bit mode, dont skip system plugin * tools/makeinst-script.sh.in: include MUI2.nsh
author John Donoghue
date Wed, 28 Feb 2018 11:01:19 -0500
parents e5efd844c4c8
children cd94e0f04e87
files src/nsis.mk tools/makeinst-script.sh.in
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/nsis.mk	Wed Feb 28 11:01:16 2018 -0500
+++ b/src/nsis.mk	Wed Feb 28 11:01:19 2018 -0500
@@ -18,7 +18,10 @@
 
 ifeq ($(ENABLE_WINDOWS_64),yes)
     $(PKG)_PREBUILD = \
-        $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script'
+        $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script' && \
+        $(SED) -i 's/m_target_type=TARGET_X86ANSI/m_target_type=TARGET_AMD64/' '$(1)/Source/build.cpp' 
+
+    $(PKG)_TARGET_SCON_OPTIONS := TARGET_ARCH=amd64
 endif
 
 define $(PKG)_BUILD
@@ -27,7 +30,7 @@
         PATH='$(PATH)' \
         MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \
         PREFIX='$(BUILD_TOOLS_PREFIX)' \
-        SKIPPLUGINS='System' \
+        $($(PKG)_TARGET_SCON_OPTIONS) \
         SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \
         NSIS_MAX_STRLEN=8192 \
         install
--- a/tools/makeinst-script.sh.in	Wed Feb 28 11:01:16 2018 -0500
+++ b/tools/makeinst-script.sh.in	Wed Feb 28 11:01:19 2018 -0500
@@ -79,7 +79,7 @@
 \${StrRep}
 ######################################################################
 ; MUI settings
-!include "MUI.nsh"
+!include "MUI2.nsh"
 
 ; custom dialogs
 !include nsDialogs.nsh