Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emscripten build handles spaces in Emscripten install dir path

Browse Source
This commit is contained in:
Mikulas Florek
2016-05-03 10:22:57 +02:00
parent 498eb04f9c
commit 43232dff7c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/toolchain.lua
View File

@@ -168,9 +168,9 @@ function toolchain(_buildDir, _libDir)
print("Set EMSCRIPTEN enviroment variable.") print("Set EMSCRIPTEN enviroment variable.")
end end
premake.gcc.cc = "$(EMSCRIPTEN)/emcc" premake.gcc.cc = "\"$(EMSCRIPTEN)/emcc\""
premake.gcc.cxx = "$(EMSCRIPTEN)/em++" premake.gcc.cxx = "\"$(EMSCRIPTEN)/em++\""
premake.gcc.ar = "$(EMSCRIPTEN)/emar" premake.gcc.ar = "\"$(EMSCRIPTEN)/emar\""
premake.gcc.llvm = true premake.gcc.llvm = true
location (path.join(_buildDir, "projects", _ACTION .. "-asmjs")) location (path.join(_buildDir, "projects", _ACTION .. "-asmjs"))
@@ -840,8 +840,8 @@ function toolchain(_buildDir, _libDir)
objdir (path.join(_buildDir, "asmjs/obj")) objdir (path.join(_buildDir, "asmjs/obj"))
libdirs { path.join(_libDir, "lib/asmjs") } libdirs { path.join(_libDir, "lib/asmjs") }
buildoptions { buildoptions {
"-isystem$(EMSCRIPTEN)/system/include", "-i\"system$(EMSCRIPTEN)/system/include\"",
"-isystem$(EMSCRIPTEN)/system/include/libc", "-i\"system$(EMSCRIPTEN)/system/include/libc\"",
"-Wunused-value", "-Wunused-value",
"-Wundef", "-Wundef",
} }
@@ -1223,7 +1223,7 @@ function strip()
configuration { "asmjs" } configuration { "asmjs" }
postbuildcommands { postbuildcommands {
"$(SILENT) echo Running asmjs finalize.", "$(SILENT) echo Running asmjs finalize.",
"$(SILENT) $(EMSCRIPTEN)/emcc -O2 " "$(SILENT) \"$(EMSCRIPTEN)/emcc\" -O2 "
-- .. "-s EMTERPRETIFY=1 " -- .. "-s EMTERPRETIFY=1 "
-- .. "-s EMTERPRETIFY_ASYNC=1 " -- .. "-s EMTERPRETIFY_ASYNC=1 "
.. "-s TOTAL_MEMORY=268435456 " .. "-s TOTAL_MEMORY=268435456 "