Mercurial > hg > piper-vamp-js

diff 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
line wrap: on
line diff
--- a/Makefile.inc	Wed Jun 13 15:55:39 2018 +0100
+++ b/Makefile.inc	Wed Feb 27 11:29:53 2019 +0000
@@ -103,15 +103,16 @@
                 --memory-init-file 0 \
 		-s MODULARIZE=1 \
 		-s NO_FILESYSTEM=1 \
-		-s MEM_INIT_METHOD=0 \
+                -s ASSERTIONS=1 \
 		-s ERROR_ON_UNDEFINED_SYMBOLS=1 \
 	    	-s "EXPORT_NAME='$(EM_MODULE_SYMBOL)'" \
 	    	-s "EXPORTED_FUNCTIONS=['_piperRequestJson', '_piperProcessRaw', '_piperFreeJson', '_malloc', '_free']" \
-                -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap', 'allocate', 'ALLOC_NORMAL', 'Pointer_stringify', 'intArrayFromString']" \
+                -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap', 'allocate', 'ALLOC_NORMAL', 'UTF8ToString', 'intArrayFromString']" \
 		$(EMFLAGS)
 
 EMFLAGS_ASMJS   := \
                 $(EMFLAGS_ANY) \
+		-s MEM_INIT_METHOD=0 \
                 -s WASM=0
 
 EMFLAGS_WASM    := \
@@ -179,6 +180,8 @@
 $(SO_MODULE):	$(OBJECTS)
 		$(CXX) -o $@ $^ $(LDFLAGS)
 
+test:           test-em test-wasm
+
 test-em:	em
 		$(NODE) $(MY_DIR)/test/node-load-test.js $(shell pwd)/$(EM_MODULE_U)