[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/13] ui/gtk: build as module
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/13] ui/gtk: build as module |
Date: |
Mon, 5 Mar 2018 09:48:41 +0100 |
Also drop gtk and vte libs from libs_softmmu, so the libs are not
pulled in unless the gtk module actually gets loaded.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
configure | 5 ++---
ui/Makefile.objs | 17 +++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index fbfbb64029..ad36320a4c 100755
--- a/configure
+++ b/configure
@@ -2558,7 +2558,6 @@ if test "$gtk" != "no"; then
gtk_cflags="$gtk_cflags $x11_cflags"
gtk_libs="$gtk_libs $x11_libs"
fi
- libs_softmmu="$gtk_libs $libs_softmmu"
gtk="yes"
elif test "$gtk" = "yes"; then
feature_not_found "gtk" "Install gtk3-devel"
@@ -2808,7 +2807,6 @@ if test "$vte" != "no"; then
vte_cflags=$($pkg_config --cflags $vtepackage)
vte_libs=$($pkg_config --libs $vtepackage)
vteversion=$($pkg_config --modversion $vtepackage)
- libs_softmmu="$vte_libs $libs_softmmu"
vte="yes"
elif test "$vte" = "yes"; then
if test "$gtkabi" = "3.0"; then
@@ -6149,7 +6147,7 @@ if test "$glib_subprocess" = "yes" ; then
echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak
fi
if test "$gtk" = "yes" ; then
- echo "CONFIG_GTK=y" >> $config_host_mak
+ echo "CONFIG_GTK=m" >> $config_host_mak
echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
echo "GTK_LIBS=$gtk_libs" >> $config_host_mak
@@ -6200,6 +6198,7 @@ fi
if test "$vte" = "yes" ; then
echo "CONFIG_VTE=y" >> $config_host_mak
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
+ echo "VTE_LIBS=$vte_libs" >> $config_host_mak
fi
if test "$virglrenderer" = "yes" ; then
echo "CONFIG_VIRGL=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 9b725b07aa..49223b0573 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -16,7 +16,6 @@ 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
-common-obj-$(CONFIG_GTK) += gtk.o
common-obj-$(CONFIG_X11) += x_keymap.o
x_keymap.o-cflags := $(X11_CFLAGS)
@@ -34,6 +33,12 @@ endif
sdl.mo-cflags := $(SDL_CFLAGS)
sdl.mo-libs := $(SDL_LIBS)
+# ui-gtk module
+common-obj-$(CONFIG_GTK) += gtk.mo
+gtk.mo-objs := gtk.o
+gtk.mo-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
+gtk.mo-libs := $(GTK_LIBS) $(VTE_LIBS)
+
ifeq ($(CONFIG_OPENGL),y)
common-obj-y += shader.o
common-obj-y += console-gl.o
@@ -41,17 +46,13 @@ common-obj-y += egl-helpers.o
common-obj-y += egl-context.o
common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
ifeq ($(CONFIG_GTK_GL),y)
-common-obj-$(CONFIG_GTK) += gtk-gl-area.o
+gtk.mo-objs += gtk-gl-area.o
else
-common-obj-$(CONFIG_GTK) += gtk-egl.o
+gtk.mo-objs += gtk-egl.o
+gtk.mo-libs += $(OPENGL_LIBS)
endif
endif
-gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
-gtk-egl.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
-gtk-gl-area.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
-
-gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS)
--
2.9.3
- [Qemu-devel] [PULL 00/13] Ui 20180305 patches, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_*, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 02/13] sdl: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 05/13] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 04/13] curses: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 07/13] console: add ui module loading support, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 03/13] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 13/13] ui/sdl: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 06/13] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 10/13] ui/gtk: build as module,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 08/13] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 01/13] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 09/13] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 11/13] ui/curses: build as module, Gerd Hoffmann, 2018/03/05
- Re: [Qemu-devel] [PULL 00/13] Ui 20180305 patches, Peter Maydell, 2018/03/05