11 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index c049c3c6b..3bfbc0c1a 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,8 @@
 echo "building asm2wasm"
-g++ -O2 -std=c++11 src/asm2wasm-main.cpp src/parser.cpp src/simple_ast.cpp src/optimizer-shared.cpp -g -o bin/asm2wasm
+g++ -O2 -std=c++11 src/asm2wasm-main.cpp src/emscripten-optimizer/parser.cpp src/emscripten-optimizer/simple_ast.cpp src/emscripten-optimizer/optimizer-shared.cpp -g -o bin/asm2wasm -Isrc/emscripten-optimizer
 echo "building interpreter/js"
-em++ -std=c++11 src/wasm-js.cpp src/parser.cpp src/simple_ast.cpp src/optimizer-shared.cpp -o bin/wasm.js -s MODULARIZE=1 -s 'EXPORT_NAME="WasmJS"' --memory-init-file 0 -s DEMANGLE_SUPPORT=1 -O3 -profiling -s TOTAL_MEMORY=67108864 -s SAFE_HEAP=1 -s ASSERTIONS=1 #-DWASM_JS_DEBUG #-DWASM_INTERPRETER_DEBUG
+em++ -std=c++11 src/wasm-js.cpp src/emscripten-optimizer/parser.cpp src/emscripten-optimizer/simple_ast.cpp src/emscripten-optimizer/optimizer-shared.cpp -o bin/wasm.js -s MODULARIZE=1 -s 'EXPORT_NAME="WasmJS"' --memory-init-file 0 -s DEMANGLE_SUPPORT=1 -O3 -profiling -s TOTAL_MEMORY=67108864 -s SAFE_HEAP=1 -s ASSERTIONS=1  -Isrc/emscripten-optimizer #-DWASM_JS_DEBUG #-DWASM_INTERPRETER_DEBUG
 cat src/js/post.js >> bin/wasm.js
 echo "building wasm shell"
-g++ -O2 -std=c++11 src/wasm-shell.cpp -g -o bin/wasm-shell
+g++ -O2 -std=c++11 src/wasm-shell.cpp -g -o bin/wasm-shell -Isrc/emscripten-optimizer
 
diff --git a/src/colors.h b/src/emscripten-optimizer/colors.h
index 96a7baf29..96a7baf29 100644
--- a/src/colors.h
+++ b/src/emscripten-optimizer/colors.h
diff --git a/src/istring.h b/src/emscripten-optimizer/istring.h
index b77fec4e5..b77fec4e5 100644
--- a/src/istring.h
+++ b/src/emscripten-optimizer/istring.h
diff --git a/src/optimizer-shared.cpp b/src/emscripten-optimizer/optimizer-shared.cpp
index 1c36efc62..1c36efc62 100644
--- a/src/optimizer-shared.cpp
+++ b/src/emscripten-optimizer/optimizer-shared.cpp
diff --git a/src/optimizer.cpp b/src/emscripten-optimizer/optimizer.cpp
index d569fb928..d569fb928 100644
--- a/src/optimizer.cpp
+++ b/src/emscripten-optimizer/optimizer.cpp
diff --git a/src/optimizer.h b/src/emscripten-optimizer/optimizer.h
index 5edcaad87..5edcaad87 100644
--- a/src/optimizer.h
+++ b/src/emscripten-optimizer/optimizer.h
diff --git a/src/parser.cpp b/src/emscripten-optimizer/parser.cpp
index 06e455b0b..06e455b0b 100644
--- a/src/parser.cpp
+++ b/src/emscripten-optimizer/parser.cpp
diff --git a/src/parser.h b/src/emscripten-optimizer/parser.h
index 8ca07c6ed..8ca07c6ed 100644
--- a/src/parser.h
+++ b/src/emscripten-optimizer/parser.h
diff --git a/src/simple_ast.cpp b/src/emscripten-optimizer/simple_ast.cpp
index 89b8ce8ed..89b8ce8ed 100644
--- a/src/simple_ast.cpp
+++ b/src/emscripten-optimizer/simple_ast.cpp
diff --git a/src/simple_ast.h b/src/emscripten-optimizer/simple_ast.h
index 4012ff8f6..4012ff8f6 100644
--- a/src/simple_ast.h
+++ b/src/emscripten-optimizer/simple_ast.h
diff --git a/src/snprintf.h b/src/emscripten-optimizer/snprintf.h
index 2792a23a2..2792a23a2 100644
--- a/src/snprintf.h
+++ b/src/emscripten-optimizer/snprintf.h