Merge branch 'master' into vulkan

xenia-build

@@ -514,7 +514,7 @@ def run_platform_premake(target_os_override=None, cc='clang', devenv=None):
                 vs_version = os.environ['VSVERSION']
             devenv = 'vs' + vs_version
         elif target_os == 'android':
-            devenv = 'androidmk'
+            devenv = 'androidndk'
         else:
             devenv = 'gmake2'
     if target_os != 'linux':
@@ -822,9 +822,16 @@ class BaseBuildCommand(Command):
                     ] + ([targets] if targets is not None else []) + pass_args,
                     shell=False)
         elif sys.platform == 'darwin':
-            # TODO(benvanik): other platforms.
-            print('ERROR: don\'t know how to build on this platform.')
-            result = 1
+            schemes = args['target'] if len(args['target']) else ['xenia-app']
+            nested_args = [['-scheme', scheme] for scheme in schemes]
+            scheme_args = [arg for pair in nested_args for arg in pair]
+            result = subprocess.call([
+                'xcodebuild',
+                '-workspace',
+                'build/xenia.xcworkspace',
+                '-configuration',
+                args['config']
+            ] + scheme_args + pass_args, shell=False, env=dict(os.environ))
         else:
             result = subprocess.call([
                 'make',
@@ -1687,6 +1694,9 @@ class DevenvCommand(Command):
                 print('ERROR: Visual Studio is not installed.');
                 return 1
             print('Launching Visual Studio...')
+        elif sys.platform == 'darwin':
+            print('Launching Xcode...')
+            devenv = 'xcode4'
         elif has_bin('clion') or has_bin('clion.sh'):
             print('Launching CLion...')
             show_reload_prompt = create_clion_workspace()
@@ -1708,6 +1718,11 @@ class DevenvCommand(Command):
                 'devenv',
                 'build\\xenia.sln',
             ])
+        elif sys.platform == 'darwin':
+            shell_call([
+                'xed',
+                'build/xenia.xcworkspace',
+            ])
         elif has_bin('clion'):
             shell_call([
                 'clion',