aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-05-24 13:32:27 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-05-24 13:32:27 -0700
commit5f76d8e64efef639e483d15cc729075e942ca234 (patch)
treebaccac5048e00bac22d396a9aed8bc11ac623d21 /emcc
parentc526e8e8ac9b8d19b251ac1766bf3c90cfddbd46 (diff)
parent1fa15abb03e0e2c40761a3226b60d3f8a3e96231 (diff)
Merge pull request #1203 from michaeljbishop/objc-support
Allow Emscripten to recognize and compile .m and .mm files
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc4
1 files changed, 2 insertions, 2 deletions
diff --git a/emcc b/emcc
index f60ddbaa..9674c41c 100755
--- a/emcc
+++ b/emcc
@@ -601,7 +601,7 @@ if EMMAKEN_CFLAGS: CC_ADDITIONAL_ARGS += shlex.split(EMMAKEN_CFLAGS)
# ---------------- Utilities ---------------
-SOURCE_SUFFIXES = ('.c', '.cpp', '.cxx', '.cc')
+SOURCE_SUFFIXES = ('.c', '.cpp', '.cxx', '.cc', '.m', '.mm')
BITCODE_SUFFIXES = ('.bc', '.o', '.obj')
DYNAMICLIB_SUFFIXES = ('.dylib', '.so', '.dll')
STATICLIB_SUFFIXES = ('.a',)
@@ -629,7 +629,7 @@ header = False # pre-compiled headers. We fake that by just copying the file
for i in range(1, len(sys.argv)):
arg = sys.argv[i]
if not arg.startswith('-'):
- if arg.endswith('.c'):
+ if arg.endswith(('.c','.m')):
use_cxx = False
if arg.endswith('.h') and sys.argv[i-1] != '-include':
header = True