emulator: use cocoa UI as a default

Use cocoa UI as a default when a user wants to use a default console
provided by QEMU. It is mostly used with non-tizen disk images.

Change-Id: Ia9377f032bfdc79344a9b5e3c0163478c24d4640
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index cdd33abf48590f9a6537517dd19daa39fbc5d95f..045e054c88f315ecf22111bb07943d0bd59ba2db 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -174,8 +174,7 @@ CONFIGURE_APPEND="
  --extra-cflags=-Wno-error=deprecated-declarations
  --extra-ldflags=-lstdc++
  --audio-drv-list=coreaudio
- --disable-cocoa
- --disable-sdl
+ --enable-cocoa
  --enable-hax
  $CONFIGURE_APPEND
 "

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 307a1e2f8858201fd02848abf082aae9ee8fe48a..8d85458892255a34f19883d6b799c70d0dfb8cdb 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -294,8 +294,11 @@ void start_skin(bool skin_enabled)
 }
 #endif
 
+#ifdef CONFIG_COCOA
+int cocoa_main(int argc, const char * argv[]);
+#else
 int qemu_main(int argc, char **argv, char **envp);
-int legacy_emulator_main(int argc, char **argv, char **envp);
+#endif
 
 static int emulator_main(int argc, char *argv[], char **envp)
 {
@@ -393,7 +396,11 @@ static int emulator_main(int argc, char *argv[], char **envp)
     print_options_info();
 
     LOG_INFO("qemu main start...\n");
+#ifdef CONFIG_COCOA
+    cocoa_main(_qemu_argc, (const char **)_qemu_argv);
+#else
     qemu_main(_qemu_argc, _qemu_argv, envp);
+#endif
 
     return 0;
 }

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 334e6f666795200c3ba7dbd7410e8217fae4e85a..fabb98c7b440007edff16f0ddabe7b6d52b76877 100644 (file)
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1127,6 +1127,10 @@ QemuCocoaView *cocoaView;
 
 @end
 
+#ifdef CONFIG_MARU
+int cocoa_main (int argc, const char * argv[]);
+#define main cocoa_main
+#endif
 
 int main (int argc, const char * argv[]) {
 
@@ -1144,6 +1148,11 @@ int main (int argc, const char * argv[]) {
                 opt++;
             }
             if (!strcmp(opt, "-h") || !strcmp(opt, "-help") ||
+#ifdef CONFIG_MARU
+                // XXX: we assume that a user do not want to use cocoa UI
+                // if -display is specified
+                !strcmp(opt, "-display") ||
+#endif
                 !strcmp(opt, "-vnc") ||
                 !strcmp(opt, "-nographic") ||
                 !strcmp(opt, "-version") ||