summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-04-19 16:55:20 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:53 -0300
commit476db0814d8953e6c5f2dd0299249be3a751fc6a (patch)
tree7c3854fdf3954bb5d645ff8df0b529e13fc95d34 /vl.c
parent674ec686936fcde6977616dce2a68b42533ab2d7 (diff)
downloadqemu-476db0814d8953e6c5f2dd0299249be3a751fc6a.tar.gz
qemu-476db0814d8953e6c5f2dd0299249be3a751fc6a.tar.bz2
qemu-476db0814d8953e6c5f2dd0299249be3a751fc6a.zip
sdl: Initialization stubs
This reduces the number of CONFIG_SDL #ifdefs in vl.c. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/vl.c b/vl.c
index c852d105d9..d5df442701 100644
--- a/vl.c
+++ b/vl.c
@@ -4251,11 +4251,10 @@ int main(int argc, char **argv, char **envp)
early_gtk_display_init(request_opengl);
}
#endif
-#if defined(CONFIG_SDL)
if (display_type == DT_SDL) {
sdl_display_early_init(request_opengl);
}
-#endif
+
if (request_opengl == 1 && display_opengl == 0) {
#if defined(CONFIG_OPENGL)
error_report("OpenGL is not supported by the display");
@@ -4543,11 +4542,10 @@ int main(int argc, char **argv, char **envp)
case DT_CURSES:
curses_display_init(ds, full_screen);
break;
-#if defined(CONFIG_SDL)
case DT_SDL:
sdl_display_init(ds, full_screen, no_frame);
break;
-#elif defined(CONFIG_COCOA)
+#if defined(CONFIG_COCOA)
case DT_COCOA:
cocoa_display_init(ds, full_screen);
break;