diff --git a/Makefile b/Makefile index b842aa67..c8c75b30 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ ifeq (${PLATFORM}, darwin) ICON = --icon=./build/icons/whalebird.icns CERT = --sign='${CERTNAME}' endif -ifeq (${PLATFORM}, windows) - ICON = --icon=./build/icons/whalebird.ico +ifeq (${PLATFORM}, win32) + ICON = --icon=./build/icons/icon.ico endif all: install release-build package @@ -19,4 +19,4 @@ install: package.json release-build: package.json npm run pack package: release-build - electron-packager ./ whalebird --platform=${PLATFORM} --arch=x64 --electron-version=1.8.3 --build-version=${VERSION} --asar --out=packages --ignore="^/src" --ignore="^/test" --ignore="^/.electron-vue" --ignore="^/.envrc" --prune=true $(ICON) $(CERT) --overwrite + electron-packager ./ whalebird --platform=${PLATFORM} --arch=x64 --electron-version=1.8.3 --build-version=${VERSION} --asar --out=packages --ignore="^/src" --ignore="^/test" --ignore="^/.electron-vue" --ignore="^/.envrc" --ignore="^/.git" --prune=true $(ICON) $(CERT) --overwrite diff --git a/package-lock.json b/package-lock.json index 6c8e5b3f..6fb73b67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12242,6 +12242,12 @@ } } }, + "rcedit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.0.0.tgz", + "integrity": "sha512-W7DNa34x/3OgWyDHsI172AG/Lr/lZ+PkavFkHj0QhhkBRcV9QTmRJE1tDKrWkx8XHPSBsmZkNv9OKue6pncLFQ==", + "dev": true + }, "read-config-file": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-2.1.1.tgz", diff --git a/package.json b/package.json index 2c5eb0b2..b88814c5 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "multispinner": "^0.2.1", "node-loader": "^0.6.0", "node-sass": "^4.7.2", + "rcedit": "^1.0.0", "require-dir": "^0.3.0", "sass-loader": "^6.0.7", "spectron": "^3.7.1",