diff options
| author | JohnD <john.donoghue@ieee.org> | 2018-03-23 15:41:08 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-03-26 12:58:00 (GMT) |
| commit | c51e82b0f3a87948e1b17a2467852102f60180f1 (patch) | |
| tree | ccb26a126a304c42b04be4886539eef15e7f132a /src/nsis.mk | |
| parent | 503c9ebeeb9c9b4478d1d57f575e0fcbd68844c1 (diff) | |
| download | mxe-c51e82b0f3a87948e1b17a2467852102f60180f1.zip mxe-c51e82b0f3a87948e1b17a2467852102f60180f1.tar.gz mxe-c51e82b0f3a87948e1b17a2467852102f60180f1.tar.bz2 | |
nsis: Set target type to AMD64 when compiling for x86_64-w64-mingw32
Diffstat (limited to 'src/nsis.mk')
| -rw-r--r-- | src/nsis.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nsis.mk b/src/nsis.mk index 91ae648..92d57fc 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -19,14 +19,15 @@ endef define $(PKG)_BUILD $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ - $(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') cd '$(1)' && scons \ MINGW_CROSS_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') \ + SKIPPLUGINS='System' TARGET_ARCH=amd64) \ SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \ NSIS_MAX_STRLEN=8192 \ install |