diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-03-26 14:03:00 -0700 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-03-26 14:03:00 -0700 |
| commit | 25eb3f0f8088fb30bdcc04a27232fd3bfd375fca (patch) | |
| tree | 0ec3300d611bf1a9cf8c695ef1420e75817524a9 /tools/shared.py | |
| parent | e3334b5feebbb539356e0369af70b73dbbf37d52 (diff) | |
| parent | a917dfed44433c18e4a1dec0985482f8d7d06c09 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into playchannel
Conflicts:
src/library_sdl.js
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index 61ec912e..3c76d73e 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -1,4 +1,4 @@ -import shutil, time, os, sys, json, tempfile, copy +import shutil, time, os, sys, json, tempfile, copy, shlex from subprocess import Popen, PIPE, STDOUT from tempfile import mkstemp @@ -743,7 +743,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' \ #'--variable_map_output_file', filename + '.vars', '--js', filename, '--js_output_file', filename + '.cc.js'] if os.environ.get('EMCC_CLOSURE_ARGS'): - args += os.environ.get('EMCC_CLOSURE_ARGS').split(' ') + args += shlex.split(os.environ.get('EMCC_CLOSURE_ARGS')) process = Popen(args, stdout=PIPE, stderr=STDOUT) cc_output = process.communicate()[0] if process.returncode != 0 or not os.path.exists(filename + '.cc.js'): |