diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index c025dfe..8d2f687 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -247,7 +247,7 @@ endif ifeq ($(WASM),true) WASM_RESOURCES = $(LV2_RESOURCES) -ifneq ($(STATIC_BUILD),true) +ifneq ($(CARDINAL_VARIANT),mini) WASM_RESOURCES += $(CURDIR)/lv2/fomp.lv2/manifest.ttl endif @@ -384,17 +384,15 @@ LINK_FLAGS += -sINITIAL_MEMORY=64Mb LINK_FLAGS += -sLZ4=1 ifeq ($(CARDINAL_VARIANT),mini) +LINK_FLAGS += --shell-file=../emscripten/CardinalMini.html LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources -# LINK_FLAGS += -sEXPORTED_RUNTIME_METHODS=FS,cwrap else -LINK_FLAGS += --shell-file=../emscripten/shell.html -ifneq ($(STATIC_BUILD),true) -LINK_FLAGS += --use-preload-cache -LINK_FLAGS += --use-preload-plugins +LINK_FLAGS += --shell-file=../emscripten/CardinalNative.html +LINK_FLAGS += --preload-file=../../bin/CardinalNative.lv2/resources@/resources LINK_FLAGS += --preload-file=./jsfx LINK_FLAGS += --preload-file=./lv2 -endif -LINK_FLAGS += --preload-file=../../bin/CardinalNative.lv2/resources@/resources +LINK_FLAGS += --use-preload-cache +LINK_FLAGS += --use-preload-plugins endif # find . -type l | grep -v svg | grep -v ttf | grep -v art | grep -v json | grep -v png | grep -v otf | sort diff --git a/src/emscripten/CardinalMini.html b/src/emscripten/CardinalMini.html new file mode 100644 index 0000000..2de614a --- /dev/null +++ b/src/emscripten/CardinalMini.html @@ -0,0 +1,201 @@ + + + + + + + + + Cardinal Mini + + + +
+
+
Cardinal Mini
+
+
+
Downloading...
+
+ +
+
+ + +
+ + + {{{ SCRIPT }}} + + diff --git a/src/emscripten/shell.html b/src/emscripten/CardinalNative.html similarity index 100% rename from src/emscripten/shell.html rename to src/emscripten/CardinalNative.html diff --git a/src/emscripten/htaccess b/src/emscripten/htaccess index b47b6ab..408eeff 100644 --- a/src/emscripten/htaccess +++ b/src/emscripten/htaccess @@ -1,13 +1,16 @@ +AddType application/octet-stream .data +AddType application/wasm .wasm + RewriteEngine on -RewriteCond %{HTTP:Accept-Encoding} gzip +RewriteCond %{HTTP:Accept-Encoding} br RewriteCond %{REQUEST_URI} .*\.(data|js|wasm) #RewriteCond %{REQUEST_FILENAME}.gz -s -RewriteRule ^(.+) $1.gz -RewriteRule "\.data\.gz$" "-" [T=application/octet-stream,E=no-brotli,E=no-gzip] -RewriteRule "\.js\.gz$" "-" [T=application/javascript,E=no-brotli,E=no-gzip] -RewriteRule "\.wasm\.gz$" "-" [T=application/wasm,E=no-brotli,E=no-gzip] +RewriteRule ^(.+) $1.br +RewriteRule "\.data\.br$" "-" [T=application/octet-stream,E=no-brotli,E=no-gzip] +RewriteRule "\.js\.br$" "-" [T=application/javascript,E=no-brotli,E=no-gzip] +RewriteRule "\.wasm\.br$" "-" [T=application/wasm,E=no-brotli,E=no-gzip] - - Header set Content-Encoding gzip + + Header set Content-Encoding br Header append Vary Accept-Encoding