1 files changed, 2 insertions, 2 deletions
diff --git a/emcc b/emcc
index 3bd8b3d9..9674c41c 100755
--- a/emcc
+++ b/emcc
@@ -110,7 +110,7 @@ while response_file:
       sys.argv[index:index+1] = extra_args
       break
 
-if len(sys.argv) == 1 or sys.argv[1] == '--help':
+if len(sys.argv) == 1 or '--help' in sys.argv:
   this = os.path.basename('em++' if os.environ.get('EMMAKEN_CXX') else 'emcc')
 
   print '''%s [options] file...
@@ -994,7 +994,7 @@ try:
   for change in settings_changes:
     key, value = change.split('=')
     if value[0] == '@':
-      value = '"' + value + '"'
+      value = '"@' + os.path.abspath(value[1:]) + '"'
     exec('shared.Settings.' + key + ' = ' + value)
 
   # Apply effects from settings