Skip to content

Commit

Permalink
Update nomenclature in Makefile and CI YAML
Browse files Browse the repository at this point in the history
The generated WebAssembly is embedded in the JavaScript file
  • Loading branch information
mesheets committed Jul 5, 2024
1 parent 1c2fdff commit 9ff7164
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nqc_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
with:
name: nqc-native-${{ matrix.os }}
path: build/bin/
- name: Archive WebAssembly build artifacts
- name: Archive JavaScript-WebAssembly build artifacts
uses: actions/upload-artifact@v4
with:
name: nqc-WebAssembly-${{ matrix.os }}
path: build/wasm/
name: nqc-JS-WebAssembly-${{ matrix.os }}
path: build/js-wasm/
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ TCPOBJ ?= RCX_TcpPipe_none
#
OSTYPE := $(strip $(shell uname -s))

ifneq (,$(strip $(findstring $(TARGETTYPE), WebAssembly)))
# WebAssembly
ifneq (,$(strip $(findstring $(TARGETTYPE), JS-WebAssembly)))
# WebAssembly embedded in JavaScript
CXX = emcc
OBJ_SUBDIR_NAME = wobj
EXEC_SUBDIR_NAME = wasm
EXEC_SUBDIR_NAME = js-wasm
EXEC_EXT = .js

# Emscripten optimization flags documentation
Expand Down Expand Up @@ -216,7 +216,7 @@ $(EXEC_DIR)/nqc$(EXEC_EXT): compiler/parse.cpp $(OBJ)
# Emscripten build for WebAssembly
#
emscripten-emmake:
emmake make exec TARGETTYPE=WebAssembly
emmake make exec TARGETTYPE=JS-WebAssembly

#
# general rule for compiling
Expand Down

0 comments on commit 9ff7164

Please sign in to comment.