diff --git a/build/targets.simulator.web.mak b/build/targets.simulator.web.mak index c5c96149f..e8ef36832 100644 --- a/build/targets.simulator.web.mak +++ b/build/targets.simulator.web.mak @@ -1,8 +1,3 @@ HANDY_TARGETS_EXTENSIONS += zip -$(BUILD_DIR)/epsilon%packed.js: EMSCRIPTEN_INIT_FILE = 0 - $(BUILD_DIR)/test.headless.js: EMSCRIPTEN_MODULARIZE = 0 - -$(BUILD_DIR)/epsilon.packed.js: $(call object_for,$(epsilon_src)) -$(BUILD_DIR)/epsilon.official.packed.js: $(call object_for,$(epsilon_official_src)) diff --git a/build/toolchain.emscripten.mak b/build/toolchain.emscripten.mak index 1ba3119e0..5f9808065 100644 --- a/build/toolchain.emscripten.mak +++ b/build/toolchain.emscripten.mak @@ -121,8 +121,6 @@ EMFLAGS += -s WASM=0 # Configure LDFLAGS EMSCRIPTEN_MODULARIZE ?= 1 LDFLAGS += -s MODULARIZE=$(EMSCRIPTEN_MODULARIZE) -s 'EXPORT_NAME="Epsilon"' -EMSCRIPTEN_INIT_FILE ?= 1 -LDFLAGS += --memory-init-file $(EMSCRIPTEN_INIT_FILE) SFLAGS += $(EMFLAGS) LDFLAGS += $(EMFLAGS) -Oz -s EXPORTED_FUNCTIONS='["_main", "_IonSimulatorKeyboardKeyDown", "_IonSimulatorKeyboardKeyUp", "_IonSimulatorEventsPushEvent", "_IonSoftwareVersion", "_IonPatchLevel", "_IonDisplayForceRefresh"]' -s EXTRA_EXPORTED_RUNTIME_METHODS='["UTF8ToString"]' diff --git a/ion/src/simulator/web/Makefile b/ion/src/simulator/web/Makefile index 28d4c0c95..964462c01 100644 --- a/ion/src/simulator/web/Makefile +++ b/ion/src/simulator/web/Makefile @@ -26,7 +26,7 @@ endif DEFAULT = epsilon.zip -$(BUILD_DIR)/epsilon%zip: $(BUILD_DIR)/epsilon%packed.js $(BUILD_DIR)/ion/src/simulator/web/simulator.html +$(BUILD_DIR)/epsilon%zip: $(BUILD_DIR)/epsilon%js $(BUILD_DIR)/ion/src/simulator/web/simulator.html @rm -rf $(basename $@) @mkdir -p $(basename $@) @cp $< $(basename $@)/epsilon.js