diff --git a/.github/workflows/Linux-samples-audio.yml b/.github/workflows/Linux-samples-audio.yml index af49a73ea3..8c33d1d419 100644 --- a/.github/workflows/Linux-samples-audio.yml +++ b/.github/workflows/Linux-samples-audio.yml @@ -554,7 +554,7 @@ jobs: # audio/drivers/rwebaudio.c against a stand-in for its # JavaScript half: frames of the layout the page took go out # one plane per channel, and every byte count is in frames of - # that layout. Then emscripten/library_rwebaudio.js itself + # that layout. Then os/emscripten/library_rwebaudio.js itself # under Node with a mock AudioContext: the destination is # widened only past stereo and only as far as its # maxChannelCount allows, and a stereo one is left as it was. diff --git a/Makefile.emscripten b/Makefile.emscripten index 849e9494e0..f5a1385659 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -193,9 +193,9 @@ LDFLAGS := -L. --no-heap-copy -s STACK_SIZE=$(STACK_SIZE) -s INITIAL_MEMORY=$(IN -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0 \ -s ENVIRONMENT=web,worker -s WASM_BIGINT=1 \ -s FETCH=1 \ - --extern-pre-js emscripten/extern_pre.js \ - --js-library emscripten/library_rwebcam.js \ - --js-library emscripten/library_platform_emscripten.js + --extern-pre-js os/emscripten/extern_pre.js \ + --js-library os/emscripten/library_rwebcam.js \ + --js-library os/emscripten/library_platform_emscripten.js ifeq ($(HAVE_OPENGLES), 1) ifeq ($(HAVE_OPENGLES3), 1) @@ -214,7 +214,7 @@ ifeq ($(FS_DEBUG), 1) endif ifeq ($(HAVE_RWEBAUDIO), 1) - LDFLAGS += --js-library emscripten/library_rwebaudio.js + LDFLAGS += --js-library os/emscripten/library_rwebaudio.js DEFINES += -DHAVE_RWEBAUDIO ifeq ($(PROXY_TO_PTHREAD), 1) $(error ERROR: RWEBAUDIO is incompatible with PROXY_TO_PTHREAD) @@ -290,7 +290,7 @@ else ifeq ($(ASYNC), 1) endif ifeq ($(CLOSURE_COMPILER), 1) - LDFLAGS += --closure 1 --closure-args=--externs=emscripten/closure_externs.js --post-js emscripten/closure_post.js + LDFLAGS += --closure 1 --closure-args=--externs=os/emscripten/closure_externs.js --post-js os/emscripten/closure_post.js endif include Makefile.common diff --git a/emscripten/closure_externs.js b/os/emscripten/closure_externs.js similarity index 100% rename from emscripten/closure_externs.js rename to os/emscripten/closure_externs.js diff --git a/emscripten/closure_post.js b/os/emscripten/closure_post.js similarity index 100% rename from emscripten/closure_post.js rename to os/emscripten/closure_post.js diff --git a/emscripten/extern_pre.js b/os/emscripten/extern_pre.js similarity index 100% rename from emscripten/extern_pre.js rename to os/emscripten/extern_pre.js diff --git a/emscripten/library_platform_emscripten.js b/os/emscripten/library_platform_emscripten.js similarity index 100% rename from emscripten/library_platform_emscripten.js rename to os/emscripten/library_platform_emscripten.js diff --git a/emscripten/library_rwebaudio.js b/os/emscripten/library_rwebaudio.js similarity index 100% rename from emscripten/library_rwebaudio.js rename to os/emscripten/library_rwebaudio.js diff --git a/emscripten/library_rwebcam.js b/os/emscripten/library_rwebcam.js similarity index 100% rename from emscripten/library_rwebcam.js rename to os/emscripten/library_rwebcam.js diff --git a/samples/audio/rwebaudio/rwebaudio_js_test.js b/samples/audio/rwebaudio/rwebaudio_js_test.js index 8ebf2ce1de..9ab1dfdc94 100644 --- a/samples/audio/rwebaudio/rwebaudio_js_test.js +++ b/samples/audio/rwebaudio/rwebaudio_js_test.js @@ -1,4 +1,4 @@ -/* emscripten/library_rwebaudio.js under Node, against a mock +/* os/emscripten/library_rwebaudio.js under Node, against a mock * AudioContext: the destination is widened only as far as its * maxChannelCount and only past stereo, passes channels through as * they are, and each queued buffer carries one plane per channel. A @@ -42,7 +42,7 @@ const sandbox = { autoAddDeps: () => {}, }; vm.createContext(sandbox); -vm.runInContext(fs.readFileSync(path.join(__dirname, "../../../emscripten/library_rwebaudio.js"), "utf8"), sandbox); +vm.runInContext(fs.readFileSync(path.join(__dirname, "../../../os/emscripten/library_rwebaudio.js"), "utf8"), sandbox); check(lib !== null, "the library did not register"); /* what emscripten makes of it: $X is X, the rest _X */