From nobody Fri Oct 24 22:15:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519718970660367.64899650877555; Tue, 27 Feb 2018 00:09:30 -0800 (PST) Received: from localhost ([::1]:35399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqaKF-0002pH-AI for importer@patchew.org; Tue, 27 Feb 2018 03:09:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqaIL-0001de-GY for qemu-devel@nongnu.org; Tue, 27 Feb 2018 03:07:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqaIJ-0003DY-D1 for qemu-devel@nongnu.org; Tue, 27 Feb 2018 03:07:29 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35472 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqaIJ-0003D7-8f for qemu-devel@nongnu.org; Tue, 27 Feb 2018 03:07:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E57D2EAEA0 for ; Tue, 27 Feb 2018 08:07:26 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CE252026E03; Tue, 27 Feb 2018 08:07:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1A5FFA1FC; Tue, 27 Feb 2018 09:07:25 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 27 Feb 2018 09:07:22 +0100 Message-Id: <20180227080724.13585-11-kraxel@redhat.com> In-Reply-To: <20180227080724.13585-1-kraxel@redhat.com> References: <20180227080724.13585-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 27 Feb 2018 08:07:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 27 Feb 2018 08:07:26 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 10/12] sdl: build as ui module X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Shared library dependencies dropped from qemu-system-*: libSDL2-2.0.so.0 =3D> /lib64/libSDL2-2.0.so.0 Signed-off-by: Gerd Hoffmann Message-id: 20180221131537.31341-11-kraxel@redhat.com --- configure | 2 +- Makefile.objs | 1 + ui/Makefile.objs | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ab1ba9c47d..edbc568913 100755 --- a/configure +++ b/configure @@ -6031,7 +6031,7 @@ if test "$have_x11" =3D "yes" -a "$need_x11" =3D "yes= "; then echo "X11_LIBS=3D$x11_libs" >> $config_host_mak fi if test "$sdl" =3D "yes" ; then - echo "CONFIG_SDL=3Dy" >> $config_host_mak + echo "CONFIG_SDL=3Dm" >> $config_host_mak echo "CONFIG_SDLABI=3D$sdlabi" >> $config_host_mak echo "SDL_CFLAGS=3D$sdl_cflags" >> $config_host_mak echo "SDL_LIBS=3D$sdl_libs" >> $config_host_mak diff --git a/Makefile.objs b/Makefile.objs index 5dc134818c..57ca6d908b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -56,6 +56,7 @@ common-obj-y +=3D hw/ common-obj-y +=3D replay/ =20 common-obj-y +=3D ui/ +common-obj-m +=3D ui/ common-obj-y +=3D bt-host.o bt-vhci.o bt-host.o-cflags :=3D $(BLUEZ_CFLAGS) =20 diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 9b725b07aa..ef4bd83fde 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -11,7 +11,6 @@ common-obj-y +=3D keymaps.o console.o cursor.o qemu-pixma= n.o common-obj-y +=3D input.o input-keymap.o input-legacy.o common-obj-$(CONFIG_LINUX) +=3D input-linux.o common-obj-$(CONFIG_SPICE) +=3D spice-core.o spice-input.o spice-display.o -common-obj-$(CONFIG_SDL) +=3D sdl.mo common-obj-$(CONFIG_COCOA) +=3D cocoa.o common-obj-$(CONFIG_CURSES) +=3D curses.o common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) @@ -22,6 +21,8 @@ common-obj-$(CONFIG_X11) +=3D x_keymap.o x_keymap.o-cflags :=3D $(X11_CFLAGS) x_keymap.o-libs :=3D $(X11_LIBS) =20 +# ui-sdl module +common-obj-$(CONFIG_SDL) +=3D sdl.mo ifeq ($(CONFIG_SDLABI),1.2) sdl.mo-objs :=3D sdl.o sdl_zoom.o endif --=20 2.9.3