Merge pull request #27 from berdan/emscripten-to-gossamer
Move emscripten targets to gossamer's rules.mk
This commit is contained in:
commit
9d71e43e9c
11
Makefile
11
Makefile
@ -47,16 +47,7 @@ ifdef NOSLEEP
|
|||||||
DEFINES += -DMOVEMENT_LOW_ENERGY_MODE_FORBIDDEN
|
DEFINES += -DMOVEMENT_LOW_ENERGY_MODE_FORBIDDEN
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef EMSCRIPTEN
|
# Emscripten targets are now handled in rules.mk in gossamer
|
||||||
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
|
|
||||||
|
|
||||||
# Add your include directories here.
|
# Add your include directories here.
|
||||||
INCLUDES += \
|
INCLUDES += \
|
||||||
|
|||||||
2
gossamer
2
gossamer
@ -1 +1 @@
|
|||||||
Subproject commit eb8e7d6445c2066ce420fae1cc2af11bec5da9ad
|
Subproject commit dd9e89b9a096d58f9d4a8c0ad2b51884be66e3d7
|
||||||
Loading…
x
Reference in New Issue
Block a user