Skip to content

Commit 9ff7164

Browse files
committed
Update nomenclature in Makefile and CI YAML
The generated WebAssembly is embedded in the JavaScript file
1 parent 1c2fdff commit 9ff7164

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/nqc_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
with:
2929
name: nqc-native-${{ matrix.os }}
3030
path: build/bin/
31-
- name: Archive WebAssembly build artifacts
31+
- name: Archive JavaScript-WebAssembly build artifacts
3232
uses: actions/upload-artifact@v4
3333
with:
34-
name: nqc-WebAssembly-${{ matrix.os }}
35-
path: build/wasm/
34+
name: nqc-JS-WebAssembly-${{ matrix.os }}
35+
path: build/js-wasm/

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ TCPOBJ ?= RCX_TcpPipe_none
8989
#
9090
OSTYPE := $(strip $(shell uname -s))
9191

92-
ifneq (,$(strip $(findstring $(TARGETTYPE), WebAssembly)))
93-
# WebAssembly
92+
ifneq (,$(strip $(findstring $(TARGETTYPE), JS-WebAssembly)))
93+
# WebAssembly embedded in JavaScript
9494
CXX = emcc
9595
OBJ_SUBDIR_NAME = wobj
96-
EXEC_SUBDIR_NAME = wasm
96+
EXEC_SUBDIR_NAME = js-wasm
9797
EXEC_EXT = .js
9898

9999
# Emscripten optimization flags documentation
@@ -216,7 +216,7 @@ $(EXEC_DIR)/nqc$(EXEC_EXT): compiler/parse.cpp $(OBJ)
216216
# Emscripten build for WebAssembly
217217
#
218218
emscripten-emmake:
219-
emmake make exec TARGETTYPE=WebAssembly
219+
emmake make exec TARGETTYPE=JS-WebAssembly
220220

221221
#
222222
# general rule for compiling

0 commit comments

Comments
 (0)