Mercurial > mxe-octave

comparison src/nsis.mk @ 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 a62c4469e2aa
children 3cb0c4f3e842
comparison
equal deleted inserted replaced
4607:e5efd844c4c8 4608:dac40a0ff814
16 tail -1 16 tail -1
17 endef 17 endef
18 18
19 ifeq ($(ENABLE_WINDOWS_64),yes) 19 ifeq ($(ENABLE_WINDOWS_64),yes)
20 $(PKG)_PREBUILD = \ 20 $(PKG)_PREBUILD = \
21 $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script' 21 $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script' && \
22 $(SED) -i 's/m_target_type=TARGET_X86ANSI/m_target_type=TARGET_AMD64/' '$(1)/Source/build.cpp'
23
24 $(PKG)_TARGET_SCON_OPTIONS := TARGET_ARCH=amd64
22 endif 25 endif
23 26
24 define $(PKG)_BUILD 27 define $(PKG)_BUILD
25 $($(PKG)_PREBUILD) 28 $($(PKG)_PREBUILD)
26 cd '$(1)' && scons VERBOSE=1 \ 29 cd '$(1)' && scons VERBOSE=1 \
27 PATH='$(PATH)' \ 30 PATH='$(PATH)' \
28 MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \ 31 MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \
29 PREFIX='$(BUILD_TOOLS_PREFIX)' \ 32 PREFIX='$(BUILD_TOOLS_PREFIX)' \
30 SKIPPLUGINS='System' \ 33 $($(PKG)_TARGET_SCON_OPTIONS) \
31 SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \ 34 SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \
32 NSIS_MAX_STRLEN=8192 \ 35 NSIS_MAX_STRLEN=8192 \
33 install 36 install
34 $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' 37 $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis'
35 endef 38 endef