[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/24] curses: build as module
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 23/24] curses: build as module |
Date: |
Fri, 17 Nov 2017 11:30:45 +0100 |
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 91c9323a50..67a8c2e83a 100755
--- a/configure
+++ b/configure
@@ -3190,8 +3190,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
@@ -5761,7 +5759,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 be3dc44cc6..42ef071d17 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -12,7 +12,6 @@ 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_COCOA) += cocoa.o
-common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
common-obj-$(CONFIG_SDL) += sdl.mo
@@ -33,6 +32,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
- Re: [Qemu-devel] [PATCH 19/24] console: add and use qemu_display_find_default, (continued)
[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
[Qemu-devel] [PATCH 23/24] curses: build as module,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 24/24] build: opengl should not need X11, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 14/24] console: add qemu display registry, add gtk, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 20/24] console: add ui module loading support, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 05/24] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 22/24] gtk: build as module, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 15/24] sdl: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 06/24] sdl: use DisplayOptions, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 10/24] cocoa: use DisplayOptions, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 07/24] vl: drop no_quit variable, Gerd Hoffmann, 2017/11/17