replace -DWASM with compiler internal __EMSCRIPTEN__

This commit is contained in:
Adam Powers
2020-08-27 22:15:12 -07:00
parent 18254eb291
commit c9f5bb9ac4
4 changed files with 9 additions and 13 deletions

View File

@@ -148,9 +148,6 @@ CXX_V1 = @echo "[CXX] $<"; $(ACTUAL_CXX)
CXX = $(CXX_V$(QUIETCC))
CFLAGS+=-I../include
ifdef WANT_WASM
CFLAGS+=-DWASM
endif
# LD and LINK might be based on invoking CC and may not be able to substitute
# for QUIETCC, so feedback from them is handled differently (via $AT)

View File

@@ -17,7 +17,7 @@ EMCC_LFLAGS=-s WASM=1
EMCC_LFLAGS+=-s ALLOW_TABLE_GROWTH
EMCC_LFLAGS+=-s ASYNCIFY -s ASYNCIFY_IMPORTS='["_nhmain"]' -O3
EMCC_LFLAGS+=-s MODULARIZE
EMCC_LFLAGS+=-s EXPORTED_FUNCTIONS='["_main"]'
EMCC_LFLAGS+=-s EXPORTED_FUNCTIONS='["_main", "_stub_graphics_set_callback"]'
EMCC_LFLAGS+=-s EXPORTED_RUNTIME_METHODS='["cwrap", "ccall", "addFunction", "removeFunction", "UTF8ToString"]'
EMCC_LFLAGS+=-s ERROR_ON_UNDEFINED_SYMBOLS=0
EMCC_LFLAGS+=--embed-file wasm-data@/
@@ -25,7 +25,6 @@ EMCC_LFLAGS+=--embed-file wasm-data@/
# WASM C flags
EMCC_CFLAGS=
EMCC_CFLAGS+=-Wall -Werror
EMCC_CFLAGS+=-DWASM
EMCC_DEBUG_CFLAGS+=-s ASSERTIONS=1
EMCC_DEBUG_CFLAGS+=-s STACK_OVERFLOW_CHECK=2
EMCC_DEBUG_CFLAGS+=-s SAFE_HEAP=1