From 98bbd00eafaff0d1a8bc7db11082d76f9dfade15 Mon Sep 17 00:00:00 2001 From: Xevion Date: Sun, 14 Apr 2024 02:13:47 -0500 Subject: [PATCH] Use Rust Flags instead of variable exports --- .cargo/config.toml | 5 +++-- scripts/build.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index c65e3bb..f513c41 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -4,7 +4,8 @@ rustflags = [ # "-O", "-C", "link-args=-O2 --profiling", #"-C", "link-args=-O3 --closure 1", # "-C", "link-args=-sASYNCIFY -sALLOW_MEMORY_GROWTH=1", - # "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS=['png']", + "-C", "link-args=-sALLOW_MEMORY_GROWTH=1", + "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS=['png']", # USE_OGG, USE_VORBIS for OGG/VORBIS usage - # "-C", "link-args=--preload-file assets/", + "-C", "link-args=--preload-file assets/", ] diff --git a/scripts/build.sh b/scripts/build.sh index 531ec11..c3bdb20 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -28,7 +28,7 @@ if [ "$skip_emsdk" = 'false' ]; then source ../emsdk/emsdk_env.sh fi -export EMCC_CFLAGS="-s USE_SDL=2" +# export EMCC_CFLAGS="-s USE_SDL=2" echo "Building WASM with Emscripten" build_type='debug'