Merge branch 'master' into windows

2013-09-14 16:21:32 -04:00
parent 5cf1f7f3b2 f5191e6257
commit 60da662aff
4 changed files with 15 additions and 11 deletions
--- a/2
+++ b/2
@@ -148,6 +148,8 @@ def set_compiler_flags (conf,opt):
                conf.env['build_target'] = 'i386'
            elif re.search("powerpc", cpu) != None:
                conf.env['build_target'] = 'powerpc'
+            elif re.search("arm", cpu) != None:
+                conf.env['build_target'] = 'arm'
            else:
                conf.env['build_target'] = 'i686'
    else: