Merge vl.c

Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --git a/vl.c b/vl.c
index 1b4b1fb..0f45f8b 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4190,6 +4190,8 @@ int main(int argc, char **argv, char **envp)
 #elif defined(CONFIG_VNC)
         vnc_display = "localhost:0,to=99";
         show_vnc_port = 1;
+#elif defined(CONFIG_MARU) && defined (__APPLE__)
+        display_type = DT_MARU;
 #else
         display_type = DT_NONE;
 #endif
@@ -4453,28 +4455,7 @@ int main(int argc, char **argv, char **envp)
 
     net_check_clients();
 
-<<<<<<< HEAD
-    /* just use the first displaystate for the moment */
-    ds = get_displaystate();
-
-    if (using_spice)
-        display_remote++;
-    if (display_type == DT_DEFAULT && !display_remote) {
-#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
-        display_type = DT_SDL;
-#elif defined(CONFIG_VNC)
-        vnc_display = "localhost:0,to=99";
-        show_vnc_port = 1;
-#elif defined(CONFIG_MARU) && defined (__APPLE__)
-        display_type = DT_MARU;
-#else
-        display_type = DT_NONE;
-#endif
-    }
-
-=======
     ds = init_displaystate();
->>>>>>> test1.5
 
     /* init local displays */
     switch (display_type) {
@@ -4488,41 +4469,38 @@ int main(int argc, char **argv, char **envp)
 #if defined(CONFIG_SDL)
     case DT_SDL:
 #if defined(CONFIG_MARU)
-            /* use tizen qemu sdl */
-            maru_display_init(ds);
-
-            if (skin_disabled == 1) {
-                //do not start skin client process
-                set_emul_skin_enable(0);
-            } else {
-                set_emul_skin_enable(1);
-            }
+        /* use tizen qemu sdl */
+        maru_display_init(ds);
+        if (skin_disabled == 1) {
+            //do not start skin client process
+            set_emul_skin_enable(0);
+        } else {
+            set_emul_skin_enable(1);
+        }
 #else
-            sdl_display_init(ds, full_screen, no_frame);
-#endif
+        sdl_display_init(ds, full_screen, no_frame);
+endif
         break;
 #elif defined(CONFIG_COCOA)
     case DT_SDL:
         cocoa_display_init(ds, full_screen);
         break;
 #endif
-<<<<<<< HEAD
 #if defined(CONFIG_MARU) && defined(__APPLE__)
     case DT_MARU:
-      maru_display_init(ds);
-      if (skin_disabled == 1) {
-      //do not start skin client process
-          set_emul_skin_enable(0);
-      } else {
-         set_emul_skin_enable(1);
-      }
-    break;
-=======
+        maru_display_init(ds);
+        if (skin_disabled == 1) {
+            //do not start skin client process
+            set_emul_skin_enable(0);
+        } else {
+            set_emul_skin_enable(1);
+        }
+        break;
+#endif
 #if defined(CONFIG_GTK)
     case DT_GTK:
         gtk_display_init(ds);
         break;
->>>>>>> test1.5
 #endif
     default:
         break;