From: Lock l00p <hakzstudios@gmail.com>
Date: Sat, 30 Sep 2023 15:28:28 +0000 (+0000)
Subject: Upload changes to test on another device
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f0c5e317dfc160ca36533b6e028a71e2266f886;p=xonotic%2Fxonotic.git

Upload changes to test on another device
---

diff --git a/misc/buildfiles/emscripten/prejs.js b/misc/buildfiles/emscripten/prejs.js
index c911cf19..8eff4c51 100644
--- a/misc/buildfiles/emscripten/prejs.js
+++ b/misc/buildfiles/emscripten/prejs.js
@@ -10,7 +10,7 @@ cmd = function(input){
     }
     return 0
 }
-Module['preInit'] = function(){FS.mount(IDBFS,{},"/")}
+Module['preInit'] = function(){FS.mount("IDBFS",{},"/")}
 Module['arguments'] = ["-xonotic"]
 //pipes output to console
 Module['print'] = function(text){console.log(text); FS.syncfs()}
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 1a5ad820..a1e061c1 100755
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -303,6 +303,8 @@ case "$cmd" in
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"
+		verbose mkdir -p "$d0/.tmp/data"
+
 		if [ x"$BAD_TARGETS" = x" " ]; then
 			$ECHO "Warning: invalid empty client, default clients will be used."
 		fi
@@ -310,7 +312,7 @@ case "$cmd" in
 			verbose emmake make $MAKEFLAGS clean
 		fi
 		for T in $TARGETS; do
-			verbose emmake make $MAKEFLAGS LDFLAGS_EXTRA='--pre-js ../../../../misc/buildfiles/emscripten/prejs.js --shell-file ../../../../misc/buildfiles/emscripten/shell.html -sSINGLE_FILE -sFULL_ES2 -sUSE_ZLIB -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=100MB' EXE_UNIXSDL="darkplaces-emscripten.html" DP_SSE=0 CFLAGS_EXTRA="-I../../../../misc/builddeps/emscripten/d0_blind_id/include -L../../../../misc/builddeps/emscripten/d0_blind_id/lib -Wl,-rpath,../../../../misc/builddeps/emscripten/d0_blind_id/lib -I../../../../misc/builddeps/emscripten/gmp/include -L../../../../misc/builddeps/emscripten/gmp/lib -Wl,-rpath,../../../../misc/builddeps/emscripten/gmp/lib -L../../../../misc/builddeps/emscripten/jpeg/lib/ -Wl,-rpath,../../../../misc/builddeps/emscripten/jpeg/lib/ -I../../../../misc/builddeps/emscripten/jpeg/include/ -sUSE_SDL=2 -sUSE_ZLIB=1 -DUSE_GLES2 " LIBM="" LIBZ="" LIBJPEG="" STRIP=: "$@" "$T"
+			verbose emmake make $MAKEFLAGS LDFLAGS_EXTRA='--pre-js ../../../../misc/buildfiles/emscripten/prejs.js --embed-file ../../../../.tmp/data@data -sSINGLE_FILE -sFULL_ES2 -sUSE_ZLIB -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=700MB' EXE_UNIXSDL="darkplaces-emscripten.html" DP_SSE=0 CFLAGS_EXTRA="-I../../../../misc/builddeps/emscripten/d0_blind_id/include -L../../../../misc/builddeps/emscripten/d0_blind_id/lib -Wl,-rpath,../../../../misc/builddeps/emscripten/d0_blind_id/lib -I../../../../misc/builddeps/emscripten/gmp/include -L../../../../misc/builddeps/emscripten/gmp/lib -Wl,-rpath,../../../../misc/builddeps/emscripten/gmp/lib -L../../../../misc/builddeps/emscripten/jpeg/lib/ -Wl,-rpath,../../../../misc/builddeps/emscripten/jpeg/lib/ -I../../../../misc/builddeps/emscripten/jpeg/include/ -sUSE_SDL=2 -sUSE_ZLIB=1 -DUSE_GLES2 " LIBM="" LIBZ="" LIBJPEG="" STRIP=: "$@" "$T"
 		done
 		for T in $BAD_TARGETS; do
 			$ECHO "Warning: discarded invalid client $T."