diff options
| author | James Haggerty <james@gruemail.com> | 2022-11-02 06:18:23 +1100 |
|---|---|---|
| committer | James Haggerty <james@gruemail.com> | 2022-11-02 06:18:34 +1100 |
| commit | ad6e919107fb0bb38d01b1ed6e7ca1b56f9719ed (patch) | |
| tree | 027905b85ba3ae004c983412db59df80ed683db4 | |
| parent | b7a461d280d06749aeb14af1e8c17cbf3616055b (diff) | |
| download | Sensor-Watch-ad6e919107fb0bb38d01b1ed6e7ca1b56f9719ed.tar.gz Sensor-Watch-ad6e919107fb0bb38d01b1ed6e7ca1b56f9719ed.tar.bz2 Sensor-Watch-ad6e919107fb0bb38d01b1ed6e7ca1b56f9719ed.zip | |
Separate emscripten build directory
This avoids the need to 'make clean' before you do a simulator build
(or vice-versa).
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | make.mk | 4 | ||||
| -rwxr-xr-x | movement/make/make_alternate_fw.sh | 6 |
3 files changed, 8 insertions, 4 deletions
@@ -69,7 +69,7 @@ You may want to test out changes in the emulator first. To do this, you'll need ``` cd movement/make emmake make -python3 -m http.server 8000 -d build +python3 -m http.server -d build-sim ``` Finally, visit [watch.html](http://localhost:8000/watch.html) to see your work. @@ -1,5 +1,9 @@ ############################################################################## +ifndef EMSCRIPTEN BUILD = ./build +else +BUILD = ./build-sim +endif BIN = watch ifndef BOARD diff --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh index 575c9e52..739c8557 100755 --- a/movement/make/make_alternate_fw.sh +++ b/movement/make/make_alternate_fw.sh @@ -28,9 +28,9 @@ do make clean emmake make FIRMWARE=$VARIANT mkdir "$sim_dir/$variant/" - mv "build/watch.wasm" "$sim_dir/$variant/" - mv "build/watch.js" "$sim_dir/$variant/" - mv "build/watch.html" "$sim_dir/$variant/index.html" + mv "build-sim/watch.wasm" "$sim_dir/$variant/" + mv "build-sim/watch.js" "$sim_dir/$variant/" + mv "build-sim/watch.html" "$sim_dir/$variant/index.html" done echo "Done." |