[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] curses: build as ui module
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 12/12] curses: build as ui module |
Date: |
Wed, 21 Feb 2018 14:15:37 +0100 |
Also drop curses libs from libs_softmmu. Add CURSES_{CFLAGS,LIBS}
variables so we can use them for linking the curses module.
Shared library dependencies dropped from qemu-system-*:
libncursesw.so.5 => /lib64/libncursesw.so.5
libtinfo.so.5 => /lib64/libtinfo.so.5
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 6 +++---
ui/Makefile.objs | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index cfab17275f..4d0100ec7e 100755
--- a/configure
+++ b/configure
@@ -3268,8 +3268,6 @@ EOF
unset IFS
if compile_prog "$curses_inc" "$curses_lib" ; then
curses_found=yes
- QEMU_CFLAGS="$curses_inc $QEMU_CFLAGS"
- libs_softmmu="$curses_lib $libs_softmmu"
break
fi
done
@@ -6037,7 +6035,9 @@ if test "$cocoa" = "yes" ; then
echo "CONFIG_COCOA=y" >> $config_host_mak
fi
if test "$curses" = "yes" ; then
- echo "CONFIG_CURSES=y" >> $config_host_mak
+ echo "CONFIG_CURSES=m" >> $config_host_mak
+ echo "CURSES_CFLAGS=$curses_inc" >> $config_host_mak
+ echo "CURSES_LIBS=$curses_lib" >> $config_host_mak
fi
if test "$pipe2" = "yes" ; then
echo "CONFIG_PIPE2=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 9a0e8a94f1..dcd54a5287 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -12,7 +12,6 @@ common-obj-y += input.o input-keymap.o input-legacy.o
common-obj-$(CONFIG_LINUX) += input-linux.o
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
common-obj-$(CONFIG_COCOA) += cocoa.o
-common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
@@ -40,6 +39,11 @@ gtk.mo-objs := gtk.o
gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS)
+common-obj-$(CONFIG_CURSES) += curses.mo
+curses.mo-objs := curses.o
+curses.mo-cflags := $(CURSES_CFLAGS)
+curses.mo-libs := $(CURSES_LIBS)
+
ifeq ($(CONFIG_OPENGL),y)
common-obj-y += shader.o
common-obj-y += console-gl.o
--
2.9.3
- [Qemu-devel] [PATCH 00/12] ui: build sdl, gtk and curses as modules, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 08/12] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 12/12] curses: build as ui module,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 06/12] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 09/12] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 02/12] sdl: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 04/12] curses: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 03/12] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 01/12] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 11/12] gtk: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 05/12] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 07/12] console: add ui module loading support, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 10/12] sdl: build as ui module, Gerd Hoffmann, 2018/02/21