diff options
| author | Tony Theodore <tonyt@logyst.com> | 2021-01-09 03:39:05 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2021-01-09 03:39:05 (GMT) |
| commit | 2744350ac0c8974b192d44e7f78ca81ac2564b27 (patch) | |
| tree | 1ac08a11c31a7eb70ef10749a8b2738056eb3953 /src | |
| parent | e6f2bd5ace66bf88a2fa98503cf5b54eb188a2a5 (diff) | |
| download | mxe-2744350ac0c8974b192d44e7f78ca81ac2564b27.zip mxe-2744350ac0c8974b192d44e7f78ca81ac2564b27.tar.gz mxe-2744350ac0c8974b192d44e7f78ca81ac2564b27.tar.bz2 | |
nsis: enable x86unicode and all x86_64 plugins
based on and closes #2533
CCACHE_DISABLE & TARGET_OS not in sources, PATH already set
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsis.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nsis.mk b/src/nsis.mk index e6b8c53..f638db4 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -17,13 +17,15 @@ define $(PKG)_UPDATE tail -1 endef +# extra paths once for freebsd compatibility may no longer be relevant +# `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ +# `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ + define _$(PKG)_SCONS_OPTS XGCC_W32_PREFIX='$(TARGET)-' \ PREFIX='$(PREFIX)/$(TARGET)' \ - `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ - `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ - $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ - SKIPPLUGINS='System' TARGET_ARCH=amd64) \ + TARGET_ARCH=$(if $(findstring x86_64,$(TARGET)),amd64,x86) \ + LINKFLAGS="--oformat pei-$(if $(findstring x86_64,$(TARGET)),x86-64,i386)" \ SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \ NSIS_MAX_STRLEN=8192 endef @@ -32,10 +34,9 @@ define $(PKG)_BUILD # scons supports -j option but nsis parallel build fails # nsis uses it's own BUILD_PREFIX which isn't user configurable $(SCONS_PREP) - $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ - $(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/' '$(SOURCE_DIR)/Source/build.cpp') - + $(SED) -i 's/m_target_type=TARGET_X86ANSI/$(if $(findstring x86_64-w64,$(TARGET)), \ + m_target_type=TARGET_AMD64/,m_target_type=TARGET_X86UNICODE/)' \ + '$(SOURCE_DIR)/Source/build.cpp' cd '$(SOURCE_DIR)' && $(SCONS_LOCAL) $(PKG_SCONS_OPTS) -j '$(JOBS)' -k || \ cd '$(SOURCE_DIR)' && $(SCONS_LOCAL) $(PKG_SCONS_OPTS) -j '$(JOBS)' cd '$(SOURCE_DIR)' && $(SCONS_LOCAL) $(PKG_SCONS_OPTS) -j 1 install |