From 2bca33efd62a754447e93370f5d1d0fe857701c1 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Fri, 13 Oct 2023 15:59:05 +0800 Subject: [PATCH] updates for new mmath library --- config.nims | 3 ++- nim.cfg | 7 +++---- src/sdlife/{main.nim => sdlife.nim} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename src/sdlife/{main.nim => sdlife.nim} (100%) diff --git a/config.nims b/config.nims index de17676..6de90b9 100644 --- a/config.nims +++ b/config.nims @@ -1,7 +1,8 @@ # mode = ScriptMode.Whatif task build, "builds an example": - setCommand("c", "src/sdlife/main.nim") + setCommand("c", "src/sdlife/sdlife.nim") for i in 0..paramCount(): let param = paramStr(i) if param == "-d:wasm": + mkdir("build") cpFile("resources/index.html", "build/index.html") diff --git a/nim.cfg b/nim.cfg index e29e242..6ab728a 100644 --- a/nim.cfg +++ b/nim.cfg @@ -3,7 +3,7 @@ @end @if emscripten or asmjs or wasm: - o:"build/sdlife.js" + o:"build/sdlife.wasm" outdir:build @if not wasm: d:asmjs @@ -15,8 +15,8 @@ clang.options.linker = "" cpu = "i386" @if wasm: - passC = "-s WASM=1 -Iemscripten" - passL = "-s WASM=1 -Lemscripten -s ALLOW_MEMORY_GROWTH=1" + passC = "-s WASM=2 -Iemscripten" + passL = "-s WASM=2 -s ALLOW_MEMORY_GROWTH=1 -s USE_SDL=2 -s USE_SDL_GFX=2 -Lemscripten -flto" @elif asmjs: passC = "-s ASM_JS=1 -Iemscripten" passL = "-s ASM_JS=1 -Lemscripten" @@ -39,7 +39,6 @@ dynlibOverride:"SDL2_ttf" dynlibOverride:"SDL2_net" #passL %= "-s USE_SDL=2 ../libSDL2_gfx.o ../libSDL2_image-png.o ../libSDL2_ttf.o --preload-file ../assets" - passL %= "-s USE_SDL=2 -s USE_SDL_GFX=2" @else o:"build/sdlife" @end diff --git a/src/sdlife/main.nim b/src/sdlife/sdlife.nim similarity index 100% rename from src/sdlife/main.nim rename to src/sdlife/sdlife.nim