aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-06-15 11:16:06 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-06-15 11:16:06 -0700
commit4ab0c9fe43f0ef7463f6427277a7d137528bbd2d (patch)
tree6df1c9c7e666822357a1fae304835df5f604ee82
parent0bf5420d380a56f8942249f29160c4f9c7a23957 (diff)
move emscripten.h to emscripten/emscripten.h, so native builds can -I that dir and not get anything else
-rw-r--r--system/include/emscripten/emscripten.h (renamed from system/include/emscripten.h)0
-rw-r--r--tools/shared.py1
2 files changed, 1 insertions, 0 deletions
diff --git a/system/include/emscripten.h b/system/include/emscripten/emscripten.h
index e265e8fd..e265e8fd 100644
--- a/system/include/emscripten.h
+++ b/system/include/emscripten/emscripten.h
diff --git a/tools/shared.py b/tools/shared.py
index 3e2ce04e..f76aa7f2 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -199,6 +199,7 @@ if USE_EMSDK:
# allows projects to override them)
EMSDK_OPTS = ['-nostdinc', '-nostdinc++', '-Xclang', '-nobuiltininc', '-Xclang', '-nostdinc++', '-Xclang', '-nostdsysteminc',
'-Xclang', '-isystem' + path_from_root('system', 'include'),
+ '-Xclang', '-isystem' + path_from_root('system', 'include', 'emscripten'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'bsd'), # posix stuff
'-Xclang', '-isystem' + path_from_root('system', 'include', 'libc'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'libcxx'),