diff --git a/Makefile b/Makefile index b9295d4a..29dba4f0 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ endif # # make TARGET_ARCH= # -TARGET_ARCH = $(HOST_ARCH) +TARGET_ARCH ?= $(HOST_ARCH) # --------------------------------------------------------------------- # Code signing diff --git a/appveyor.yml b/appveyor.yml index 59564540..b6d7abcb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,22 +17,25 @@ cache: environment: global: ELECTRON_NO_ATTACH_CONSOLE: true + nodejs_version: 6.1.0 matrix: - - nodejs_version: 6.1.0 + - TARGET_ARCH: x64 + - TARGET_ARCH: x86 install: - ps: Install-Product node $env:nodejs_version x64 - npm install -g npm bower rimraf asar - choco install nsis -version 2.51 - choco install upx - - choco install 7zip.commandline + - choco install jq - set PATH=C:\Program Files (x86)\Windows Kits\8.1\bin\x86;%PATH% - set PATH=C:\Program Files (x86)\NSIS;%PATH% - set PATH=C:\Ruby22\bin;%PATH% - set PATH=C:\MinGW\bin;%PATH% - set PATH=C:\MinGW\msys\1.0\bin;%PATH% - gem install scss_lint - - .\scripts\build\windows.bat install x64 + - make info + - make electron-develop build: off