[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/24] sdl: build as module
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 21/24] sdl: build as module |
Date: |
Fri, 17 Nov 2017 11:30:43 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 2 +-
Makefile.objs | 1 +
ui/Makefile.objs | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 0e856bbc04..7d1e9b187d 100755
--- a/configure
+++ b/configure
@@ -5754,7 +5754,7 @@ if test "$modules" = "yes"; then
echo "CONFIG_MODULES=y" >> $config_host_mak
fi
if test "$sdl" = "yes" ; then
- echo "CONFIG_SDL=y" >> $config_host_mak
+ echo "CONFIG_SDL=m" >> $config_host_mak
echo "CONFIG_SDLABI=$sdlabi" >> $config_host_mak
echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
diff --git a/Makefile.objs b/Makefile.objs
index 285c6f3c15..a567df479c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -56,6 +56,7 @@ common-obj-y += hw/
common-obj-y += replay/
common-obj-y += ui/
+common-obj-m += ui/
common-obj-y += bt-host.o bt-vhci.o
bt-host.o-cflags := $(BLUEZ_CFLAGS)
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index ec8533d6d9..6c13d7e5ed 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -8,15 +8,15 @@ vnc-obj-y += vnc-ws.o
vnc-obj-y += vnc-jobs.o
common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o
-common-obj-y += input.o input-keymap.o input-legacy.o
+common-obj-y += input.o input-keymap.o input-legacy.o x_keymap.o
common-obj-$(CONFIG_LINUX) += input-linux.o
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
-common-obj-$(CONFIG_SDL) += sdl.mo x_keymap.o
common-obj-$(CONFIG_COCOA) += cocoa.o
common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
-common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
+common-obj-$(CONFIG_GTK) += gtk.o
+common-obj-$(CONFIG_SDL) += sdl.mo
ifeq ($(CONFIG_SDLABI),1.2)
sdl.mo-objs := sdl.o sdl_zoom.o
endif
--
2.9.3
- [Qemu-devel] [PATCH 00/24] RfC: rework display initialization, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 08/24] egl-headless: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 11/24] vl: drop full_screen variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 04/24] vl: rename DisplayType to LegacyDisplayType, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 03/24] sdl: use ctrl-alt-g as grab hotkey, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 09/24] curses: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 21/24] sdl: build as module,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 19/24] console: add and use qemu_display_find_default, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 17/24] curses: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 18/24] egl-headless: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 01/24] sdl: remove -no-frame support, Gerd Hoffmann, 2017/11/17