aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-03-01 21:37:28 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-03-01 21:37:28 +0000
commit5b0753e0d8dfca5a33edcd3cc1306bb5d0594005 (patch)
treeb12b8b3448c6335cbb75cbdd44a21e34cbfde8c5 /vl.c
parent157777ef3e5821643ef46470bc0fecfda9d06ece (diff)
initial Cocoa support (Pierre d'Herbemont)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1313 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 5dcf46ed07..9efb4f7daa 100644
--- a/vl.c
+++ b/vl.c
@@ -72,6 +72,11 @@
#endif
#endif /* CONFIG_SDL */
+#ifdef CONFIG_COCOA
+#undef main
+#define main qemu_main
+#endif /* CONFIG_COCOA */
+
#include "disas.h"
#include "exec-all.h"
@@ -3554,8 +3559,10 @@ int main(int argc, char **argv)
if (nographic) {
dumb_display_init(ds);
} else {
-#ifdef CONFIG_SDL
+#if defined(CONFIG_SDL)
sdl_display_init(ds, full_screen);
+#elif defined(CONFIG_COCOA)
+ cocoa_display_init(ds, full_screen);
#else
dumb_display_init(ds);
#endif