Skip to content

Commit

Permalink
Merge pull request #135 from h3poteto/windows
Browse files Browse the repository at this point in the history
Prepare for windows build
  • Loading branch information
h3poteto authored Mar 26, 2018
2 parents cb3ca8c + 1e80727 commit f3fbe6e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 7 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "whalebird",
"version": "0.1.0",
"version": "0.2.0",
"author": "AkiraFukushima <[email protected]>",
"description": "A desktop mastodon client",
"license": "MIT",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit f3fbe6e

Please sign in to comment.