aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-06-03 13:31:20 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-06-03 13:31:20 -0700
commit17cc01be344ea04447b770f3fd76ad0a5b33710f (patch)
treeeffbafd7301ab615d9d080ec526b708188b25b90
parentd9f2abbd51be7a5e8afab3ba074b96f6b9983ac7 (diff)
parent2559aa6e02b0a783fa1109c7cfbf6e89c54b73cf (diff)
Merge pull request #1235 from juj/fix_test_exported_response
Fix test_exported_response and test_asm_pgo on Windows.
-rwxr-xr-xemcc1
1 files changed, 1 insertions, 0 deletions
diff --git a/emcc b/emcc
index 65dec978..9feba1b1 100755
--- a/emcc
+++ b/emcc
@@ -995,6 +995,7 @@ try:
key, value = change.split('=')
if value[0] == '@':
value = '"@' + os.path.abspath(value[1:]) + '"'
+ value = value.replace('\\\\', '/').replace('\\', '/') # Convert backslash paths to forward slashes on Windows as well, since the JS compiler otherwise needs the backslashes escaped (alternative is to escape all input paths passing to JS, which feels clumsier to read)
exec('shared.Settings.' + key + ' = ' + value)
# Apply effects from settings