d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 1526cd5d69 into 885a031341

This commit is contained in:
Gregorio Litenstein 2020-07-24 11:58:51 +02:00 committed by GitHub
parent 885a031341 1526cd5d69
commit bfaa727a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nsis.mk
View File

@ -18,14 +18,17 @@ define $(PKG)_UPDATE
endef
define $(PKG)_SCONS_OPTS
XGCC_W32_PREFIX='$(TARGET)-' \
CCACHE_DISABLE=1 \
PATH='$(PREFIX)/bin:$(PATH)' \
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) \
XGCC_W32_PREFIX='$(TARGET)-' \
APPEND_CPPPATH="['$(PREFIX)/$(TARGET)/include'$(shell [ -d /usr/local/include ] && echo , \'/usr/local/include\')]" \
APPEND_LIBPATH="['$(PREFIX)/$(TARGET)/lib'$(shell [ -d /usr/local/lib ] && echo , \'/usr/local/lib\')]" \
TARGET_ARCH=$(if $(findstring x86_64,$(TARGET)),amd64,x86) \
TARGET_OS='windows' \
SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \
NSIS_MAX_STRLEN=8192
NSIS_MAX_STRLEN=8192 \
LINKFLAGS="--oformat pei-$(if $(findstring x86_64,$(TARGET)),x86-64,i386)"
endef
define $(PKG)_BUILD
@ -33,10 +36,9 @@ define $(PKG)_BUILD
# nsis uses it's own BUILD_PREFIX which isn't user configurable
mkdir -p '$(BUILD_DIR).scons'
$(call PREPARE_PKG_SOURCE,scons-local,'$(BUILD_DIR).scons')
$(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