From bca2fd396a2273521349450cc7bb23b06f174756 Mon Sep 17 00:00:00 2001 From: Daniel Bergman Date: Sun, 29 Jun 2025 11:00:47 +0200 Subject: [PATCH 1/2] Move emscripten targets to gossamer's rules.mk --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index cefb6988..6eb414ae 100644 --- a/Makefile +++ b/Makefile @@ -47,16 +47,7 @@ ifdef NOSLEEP DEFINES += -DMOVEMENT_LOW_ENERGY_MODE_FORBIDDEN endif -ifdef EMSCRIPTEN -all: $(BUILD)/$(BIN).elf $(BUILD)/$(BIN).html -$(BUILD)/$(BIN).html: $(OBJS) - @echo HTML $@ - @$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ \ - -s ASYNCIFY=1 \ - -s EXPORTED_RUNTIME_METHODS=lengthBytesUTF8,printErr \ - -s EXPORTED_FUNCTIONS=_main \ - --shell-file=./watch-library/simulator/shell.html -endif +# Emscripten targets are now handled in rules.mk in gossamer # Add your include directories here. INCLUDES += \ From 0d5108cbc339aa51b6d574c26f9a174e545a532b Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 30 Jun 2025 19:16:14 -0400 Subject: [PATCH 2/2] bump gossamer commit --- gossamer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gossamer b/gossamer index eb8e7d64..dd9e89b9 160000 --- a/gossamer +++ b/gossamer @@ -1 +1 @@ -Subproject commit eb8e7d6445c2066ce420fae1cc2af11bec5da9ad +Subproject commit dd9e89b9a096d58f9d4a8c0ad2b51884be66e3d7