woggioni/sdlife
1
0
Fork 0
Code Packages Releases Activity

small fixes

Browse Source
This commit is contained in:
Walter Oggioni
2023-10-13 17:20:19 +08:00
parent 2bca33efd6
commit 3280033e80
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nim.cfg
View File

@@ -3,7 +3,7 @@
@end @end
@if emscripten or asmjs or wasm: @if emscripten or asmjs or wasm:
o:"build/sdlife.wasm" o:"build/sdlife.js"
outdir:build outdir:build
@if not wasm: @if not wasm:
d:asmjs d:asmjs
@@ -15,7 +15,7 @@
clang.options.linker = "" clang.options.linker = ""
cpu = "i386" cpu = "i386"
@if wasm: @if wasm:
passC = "-s WASM=2 -Iemscripten" passC = "-s WASM=2 -Iemscripten -flto"
passL = "-s WASM=2 -s ALLOW_MEMORY_GROWTH=1 -s USE_SDL=2 -s USE_SDL_GFX=2 -Lemscripten -flto" passL = "-s WASM=2 -s ALLOW_MEMORY_GROWTH=1 -s USE_SDL=2 -s USE_SDL_GFX=2 -Lemscripten -flto"
@elif asmjs: @elif asmjs:
passC = "-s ASM_JS=1 -Iemscripten" passC = "-s ASM_JS=1 -Iemscripten"
@@ -27,9 +27,6 @@
passL %= "-O3" passL %= "-O3"
@end @end
#Fix _setjmp/longjmp problem. https://irclogs.nim-lang.org/24-09-2017.html#12:19:50
d:nimStdSetjmp # https://irclogs.nim-lang.org/24-09-2017.html#20:13:18
#SDL #SDL
define:sdl_custom_log define:sdl_custom_log
dynlibOverride:"SDL2" dynlibOverride:"SDL2"
@@ -38,7 +35,6 @@
dynlibOverride:"SDL2_mixer" dynlibOverride:"SDL2_mixer"
dynlibOverride:"SDL2_ttf" dynlibOverride:"SDL2_ttf"
dynlibOverride:"SDL2_net" dynlibOverride:"SDL2_net"
#passL %= "-s USE_SDL=2 ../libSDL2_gfx.o ../libSDL2_image-png.o ../libSDL2_ttf.o --preload-file ../assets"
@else @else
o:"build/sdlife" o:"build/sdlife"
@end @end

2
src/sdlife/sdlife.nim
View File

@@ -1,5 +1,5 @@
import options import options
import sdl2, sdl2/gfx import sdl2
import grid import grid
import geo2d import geo2d
import mmath/smatrix import mmath/smatrix