fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Implement suggestions from @pmp-p on micropython/micropython#4875

Browse Source
This commit is contained in:
Themba Dube 2019-07-08 16:53:41 -04:00
parent a132e76369
commit e93bab0c44
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/javascript/Makefile
View File

@ -8,6 +8,8 @@ WASM_FILE_API = 1
include $(TOP)/py/py.mk include $(TOP)/py/py.mk
JSFLAGS = $(BOTH_CFLAGS) -s ASSERTIONS=2 -s FORCE_FILESYSTEM=1 -s USE_SDL=2 $(OPTIM) -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_handle_pending', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" --memory-init-file 0 --js-library library.js
CC = emcc -g4 $(JSFLAGS) CC = emcc -g4 $(JSFLAGS)
LD = emcc -g4 LD = emcc -g4
@ -15,16 +17,10 @@ INC += -I.
INC += -I$(TOP) INC += -I$(TOP)
INC += -I$(BUILD) INC += -I$(BUILD)
EM_CACHE ?= $(HOME)/.emscripten_cache
BOTH_CFLAGS := -s WASM=0 BOTH_CFLAGS := -s WASM=0
CPP = clang -E CPP = clang -E
#for lvgl
CPPFLAGS += -I$(EM_CACHE)/asmjs/ports-builds/sdl2/include
ifdef WASM_FILE_API ifdef WASM_FILE_API
CPPFLAGS += -DWASM_FILE_API=1 CPPFLAGS += -DWASM_FILE_API=1
endif endif
@ -32,7 +28,7 @@ endif
ifdef EMSCRIPTEN ifdef EMSCRIPTEN
CPP += -D__EMSCRIPTEN__ CPP += -D__EMSCRIPTEN__
CPP += --sysroot $(EMSCRIPTEN)/system CPP += --sysroot $(EMSCRIPTEN)/system
CPP += $(addprefix -isystem, $(shell $(CC) -E -x c++ /dev/null -v 2>&1 |sed -e '/^\#include <...>/,/^End of search/{ //!b };d')) CPP += $(addprefix -isystem, $(shell env LC_ALL=C $(CC) -E -x c++ /dev/null -v 2>&1 |sed -e '/^\#include <...>/,/^End of search/{ //!b };d'))
CPP += $(CPPFLAGS) CPP += $(CPPFLAGS)
# Act like 'emcc' # Act like 'emcc'
CPP += -U__i386 -U__i386 -Ui386 -U__SSE -U__SSE_MATH -U__SSE2 -U__SSE2_MATH -U__MMX__ -U__SSE__ -U__SSE_MATH__ -U__SSE2__ -U__SSE2_MATH__ CPP += -U__i386 -U__i386 -Ui386 -U__SSE -U__SSE_MATH -U__SSE2 -U__SSE2_MATH -U__MMX__ -U__SSE__ -U__SSE_MATH__ -U__SSE2__ -U__SSE2_MATH__
@ -98,7 +94,6 @@ SRC_QSTR += $(SRC_C) $(LIB_SRC_C) dummy_header.h
# SRC_QSTR # SRC_QSTR
SRC_QSTR_AUTO_DEPS += SRC_QSTR_AUTO_DEPS +=
JSFLAGS = $(BOTH_CFLAGS) -s ASSERTIONS=2 -s FORCE_FILESYSTEM=1 -s USE_SDL=2 $(OPTIM) -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_handle_pending', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" --memory-init-file 0 --js-library library.js
all: $(BUILD)/micropython.js all: $(BUILD)/micropython.js