From ab4290e57d39ef079e82377d91bd27dcde4d73ae Mon Sep 17 00:00:00 2001
From: Ben Smith <binjimin@gmail.com>
Date: Tue, 25 Apr 2017 22:09:56 -0700
Subject: Fix emscripten demo and libwabt.js (#407)

This removes the more complicated emscripten wrapper we used before, in
favor of something that is much simpler.

* Remove the memory init file
* Remove the onInputKey handling in the demo so it doesn't auto-indent
  (it was broken now that we have the flat syntax)
* Simplify emscripten-helpers to provide very simple C-function wrappers
  around the wast2wasm API:

  * wabt_parse_ast
  * wabt_resolve_names_script
  * wabt_validate_script
  * wabt_write_binary_module

  The tricky part is that some functions return multiple values, so
  those are returned as structs as well:

  * WabtParseAstResult
  * WabtWriteBinaryModuleResult
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f2d87475..f2d2d935 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ FUZZ_BIN_DIR ?= ${ROOT_DIR}/afl-fuzz
 GCC_FUZZ_CC := ${FUZZ_BIN_DIR}/afl-gcc
 GCC_FUZZ_CXX := ${FUZZ_BIN_DIR}/afl-g++
 EMSCRIPTEN_DIR ?= ${ROOT_DIR}/emscripten
+CMAKE_CMD ?= cmake
 
 DEFAULT_SUFFIX = clang-debug
 
@@ -105,7 +106,7 @@ $(call CMAKE_DIR,$(1),$(2),$(3)):
 
 $(call CMAKE_DIR,$(1),$(2),$(3))$$(BUILD_FILE): | $(call CMAKE_DIR,$(1),$(2),$(3))
 	cd $(call CMAKE_DIR,$(1),$(2),$(3)) && \
-	cmake -G $$(GENERATOR) -DCMAKE_INSTALL_PREFIX=$$(ROOT_DIR) $$(ROOT_DIR) $$($(1)_FLAG) $$($(2)_FLAG) $$($(3)_FLAG)
+	$$(CMAKE_CMD) -G $$(GENERATOR) -DCMAKE_INSTALL_PREFIX=$$(ROOT_DIR) $$(ROOT_DIR) $$($(1)_FLAG) $$($(2)_FLAG) $$($(3)_FLAG)
 endef
 
 define BUILD
-- 
cgit v1.2.3