From d1d8a66ab196156ab22ba1059d714cd040b44ab6 Mon Sep 17 00:00:00 2001 From: Justin Kerk Date: Wed, 25 Nov 2015 03:10:09 +0000 Subject: Cleanup (nw) --- scripts/genie.lua | 5 ----- scripts/toolchain.lua | 9 ++++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index d8d26ebf49d..7fd13787389 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1090,11 +1090,6 @@ configuration { "asmjs" } "-std=gnu++98", } archivesplit_size "20" - if os.getenv("EMSCRIPTEN") then - includedirs { - os.getenv("EMSCRIPTEN") .. "/system/lib/libcxxabi/include" - } - end configuration { "android*" } buildoptions { diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 532fac535e8..e6e2e0e773b 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -760,10 +760,13 @@ function toolchain(_buildDir, _subDir) configuration { "asmjs" } targetdir (_buildDir .. "asmjs" .. "/bin") objdir (_buildDir .. "asmjs" .. "/obj") + includedirs { + "$(EMSCRIPTEN)/system/include", + "$(EMSCRIPTEN)/system/include/compat", + "$(EMSCRIPTEN)/system/include/libc", + "$(EMSCRIPTEN)/system/lib/libcxxabi/include", + } buildoptions { - "-isystem$(EMSCRIPTEN)/system/include", - "-isystem$(EMSCRIPTEN)/system/include/compat", - "-isystem$(EMSCRIPTEN)/system/include/libc", "-Wno-cast-align", "-Wno-tautological-compare", "-Wno-self-assign-field", -- cgit v1.2.3