Skip to content

Commit

Permalink
Merge pull request #14 from tophyr/automate
Browse files Browse the repository at this point in the history
Clean up initial build/install process
  • Loading branch information
sbyma authored Jan 14, 2021
2 parents 33a5328 + 2eff89f commit 5528924
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cpp/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

all:
node-gyp rebuild --release --target=1.7.9 --arch=x64 --dist-url=https://atom.io/download/electron
build/Release/memoro.node: $(wildcard *.cc) $(wildcard *.h) Makefile binding.gyp
../node_modules/node-gyp/bin/node-gyp.js rebuild --release --target=1.8.7 --arch=x64 --dist-url=https://atom.io/download/electron
1 change: 1 addition & 0 deletions cpp/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"target_name": "memoro",
"sources": [ "memoro.cc" , "memoro_node.cc", "pattern.cc", "stacktree.cc" ],
"cflags": ["-Wall", "-std=c++14"],
'cflags_cc!': ['-std=gnu++0x'],
"xcode_settings": {
"OTHER_CFLAGS": [
"-std=c++14"
Expand Down
5 changes: 5 additions & 0 deletions memoro.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

SCRIPTPATH=$(dirname "$(readlink -f "$0")")

(cd "$SCRIPTPATH"/cpp && make) && "$SCRIPTPATH"/node_modules/electron/cli.js "$SCRIPTPATH"
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"font-awesome": "^4.7.0",
"ipc": "0.0.1",
"jquery": "^3.3.1",
"node-gyp": "^7.1.2",
"npm": "^6.1.0",
"process": "^0.11.10"
}
Expand Down

0 comments on commit 5528924

Please sign in to comment.