From patchwork Sun Jun 16 22:48:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 251745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2DE802C009D for ; Mon, 17 Jun 2013 08:49:03 +1000 (EST) Received: from localhost ([::1]:59970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoLkq-00083j-C4 for incoming@patchwork.ozlabs.org; Sun, 16 Jun 2013 18:49:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoLka-00083c-Fy for qemu-devel@nongnu.org; Sun, 16 Jun 2013 18:48:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoLkZ-0004Xx-I9 for qemu-devel@nongnu.org; Sun, 16 Jun 2013 18:48:44 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:54331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoLkZ-0004Xp-CS for qemu-devel@nongnu.org; Sun, 16 Jun 2013 18:48:43 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 87EEB33E2D2 for ; Sun, 16 Jun 2013 22:48:40 +0000 (UTC) From: Mike Frysinger To: qemu-devel@nongnu.org Date: Sun, 16 Jun 2013 18:48:44 -0400 Message-Id: <1371422924-5742-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.8.2.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.211.166.183 Subject: [Qemu-devel] [PATCH] fix no-sdl builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The no_frame var is only defined when SDL support is enabled. Signed-off-by: Mike Frysinger --- vl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 9f8fd6e..aaa14bb 100644 --- a/vl.c +++ b/vl.c @@ -3524,9 +3524,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_full_screen: full_screen = 1; break; - case QEMU_OPTION_no_frame: - no_frame = 1; - break; case QEMU_OPTION_alt_grab: alt_grab = 1; break; @@ -3537,10 +3534,14 @@ int main(int argc, char **argv, char **envp) no_quit = 1; break; #ifdef CONFIG_SDL + case QEMU_OPTION_no_frame: + no_frame = 1; + break; case QEMU_OPTION_sdl: display_type = DT_SDL; break; #else + case QEMU_OPTION_no_frame: case QEMU_OPTION_sdl: fprintf(stderr, "SDL support is disabled\n"); exit(1); @@ -4081,10 +4082,12 @@ int main(int argc, char **argv, char **envp) #endif } +#ifdef CONFIG_SDL if ((no_frame || alt_grab || ctrl_grab) && display_type != DT_SDL) { fprintf(stderr, "-no-frame, -alt-grab and -ctrl-grab are only valid " "for SDL, ignoring option\n"); } +#endif if (no_quit && (display_type != DT_GTK && display_type != DT_SDL)) { fprintf(stderr, "-no-quit is only valid for GTK and SDL, " "ignoring option\n");