Mercurial > hg > piper-vamp-js

comparison Makefile.inc @ 176:eaf46e7647a0 tip master

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for latest Emscripten - Pointer_stringify has apparently been deprecated for a while, and was removed in v1.38.27
author Chris Cannam <cannam@all-day-breakfast.com>
date Wed, 27 Feb 2019 11:29:53 +0000
parents a91b4defa581
children
comparison
equal deleted inserted replaced
175:a91b4defa581 176:eaf46e7647a0
101 101
102 EMFLAGS_ANY := \ 102 EMFLAGS_ANY := \
103 --memory-init-file 0 \ 103 --memory-init-file 0 \
104 -s MODULARIZE=1 \ 104 -s MODULARIZE=1 \
105 -s NO_FILESYSTEM=1 \ 105 -s NO_FILESYSTEM=1 \
106 -s MEM_INIT_METHOD=0 \ 106 -s ASSERTIONS=1 \
107 -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ 107 -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
108 -s "EXPORT_NAME='$(EM_MODULE_SYMBOL)'" \ 108 -s "EXPORT_NAME='$(EM_MODULE_SYMBOL)'" \
109 -s "EXPORTED_FUNCTIONS=['_piperRequestJson', '_piperProcessRaw', '_piperFreeJson', '_malloc', '_free']" \ 109 -s "EXPORTED_FUNCTIONS=['_piperRequestJson', '_piperProcessRaw', '_piperFreeJson', '_malloc', '_free']" \
110 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap', 'allocate', 'ALLOC_NORMAL', 'Pointer_stringify', 'intArrayFromString']" \ 110 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap', 'allocate', 'ALLOC_NORMAL', 'UTF8ToString', 'intArrayFromString']" \
111 $(EMFLAGS) 111 $(EMFLAGS)
112 112
113 EMFLAGS_ASMJS := \ 113 EMFLAGS_ASMJS := \
114 $(EMFLAGS_ANY) \ 114 $(EMFLAGS_ANY) \
115 -s MEM_INIT_METHOD=0 \
115 -s WASM=0 116 -s WASM=0
116 117
117 EMFLAGS_WASM := \ 118 EMFLAGS_WASM := \
118 $(EMFLAGS_ANY) \ 119 $(EMFLAGS_ANY) \
119 -s WASM=1 \ 120 -s WASM=1 \
177 ( echo ; echo "return $(EM_MODULE_SYMBOL);}));" >> $(WASM_MODULE_U) ) 178 ( echo ; echo "return $(EM_MODULE_SYMBOL);}));" >> $(WASM_MODULE_U) )
178 179
179 $(SO_MODULE): $(OBJECTS) 180 $(SO_MODULE): $(OBJECTS)
180 $(CXX) -o $@ $^ $(LDFLAGS) 181 $(CXX) -o $@ $^ $(LDFLAGS)
181 182
183 test: test-em test-wasm
184
182 test-em: em 185 test-em: em
183 $(NODE) $(MY_DIR)/test/node-load-test.js $(shell pwd)/$(EM_MODULE_U) 186 $(NODE) $(MY_DIR)/test/node-load-test.js $(shell pwd)/$(EM_MODULE_U)
184 187
185 test-wasm: wasm 188 test-wasm: wasm
186 $(NODE) $(MY_DIR)/test/node-load-test.js $(shell pwd)/$(WASM_MODULE_U) 189 $(NODE) $(MY_DIR)/test/node-load-test.js $(shell pwd)/$(WASM_MODULE_U)