Mercurial > mxe-octave

comparison src/nsis.mk @ 3804:7e15ef9bf1e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update build-gcc, nsis to compile when in w64 mode. * src/build-binutils.mk: add windows 64 conditionals to binutils to compile multilib * src/build-gcc.mk:add windows 64 conditionals to gcc to compile multilib * src/nsis.mk: add PKG_BUILD target for windows 64 * src/win64-nsis.patch: new file. * dist-files.mk: add reference to win64-nsis.patch.
author John D
date Tue, 17 Feb 2015 14:48:23 -0500
parents e3c3beae094b
children a14a5640d12b
comparison
equal deleted inserted replaced
3803:f2776007d295 3804:7e15ef9bf1e5
14 $(WGET) -q -O- 'http://sourceforge.net/p/nsis/code/HEAD/tree/NSIS/tags/' | \ 14 $(WGET) -q -O- 'http://sourceforge.net/p/nsis/code/HEAD/tree/NSIS/tags/' | \
15 grep '<a href="' | \ 15 grep '<a href="' | \
16 $(SED) -n 's,.*<a href="v\([0-9]\)\([^"]*\)".*,\1.\2,p' | \ 16 $(SED) -n 's,.*<a href="v\([0-9]\)\([^"]*\)".*,\1.\2,p' | \
17 tail -1 17 tail -1
18 endef 18 endef
19 ifeq ($(ENABLE_WINDOWS_64),yes)
20 define $(PKG)_BUILD
21 cd '$(1)' && patch -p1 < $(TOP_DIR)/src/win64-nsis.patch
19 22
23 cd '$(1)' && scons VERBOSE=1 \
24 MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \
25 PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \
26 APPEND_LIBPATH='$(HOST_PREFIX)/lib32' \
27 SKIPUTILS='NSIS Menu' \
28 install
29 $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis'
30 endef
31 else
20 define $(PKG)_BUILD 32 define $(PKG)_BUILD
21 cd '$(1)' && scons VERBOSE=1 \ 33 cd '$(1)' && scons VERBOSE=1 \
22 MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \ 34 MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \
23 PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \ 35 PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \
24 `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ 36 `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \
25 `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ 37 `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \
26 SKIPUTILS='NSIS Menu' \ 38 SKIPUTILS='NSIS Menu' \
27 install 39 install
28 $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' 40 $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis'
29 endef 41 endef
42 endif