if (using_spice)
display_remote++;
if (display_type == DT_DEFAULT && !display_remote) {
-#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
+#if defined(CONFIG_MARU)
+ /* maru display */
+ display_type = DT_MARU;
+#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
display_type = DT_SDL;
#elif defined(CONFIG_VNC)
vnc_display = "localhost:0,to=99";
#endif
#if defined(CONFIG_SDL)
case DT_SDL:
-#if defined(CONFIG_MARU)
- /* use tizen qemu sdl */
- maruskin_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);
break;
#elif defined(CONFIG_COCOA)
case DT_SDL:
cocoa_display_init(ds, full_screen);
break;
+#endif
+#if defined(CONFIG_MARU)
+ case DT_MARU:
+ maruskin_display_init(ds);
+ if (skin_disabled == 1) {
+ set_emul_skin_enable(0);
+ } else {
+ set_emul_skin_enable(1);
+ }
+ break;
#endif
default:
break;