[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/24] gtk: build as module
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 22/24] gtk: build as module |
Date: |
Fri, 17 Nov 2017 11:30:44 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
configure | 5 ++---
ui/Makefile.objs | 16 ++++++++--------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 7d1e9b187d..91c9323a50 100755
--- a/configure
+++ b/configure
@@ -2470,7 +2470,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"
@@ -2720,7 +2719,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
@@ -5860,7 +5858,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
@@ -5911,6 +5909,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 6c13d7e5ed..be3dc44cc6 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -14,7 +14,6 @@ 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_GTK) += gtk.o
common-obj-$(CONFIG_SDL) += sdl.mo
ifeq ($(CONFIG_SDLABI),1.2)
@@ -29,6 +28,11 @@ endif
sdl.mo-cflags := $(SDL_CFLAGS)
sdl.mo-libs := $(SDL_LIBS)
+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
@@ -36,17 +40,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] [PATCH 19/24] console: add and use qemu_display_find_default, (continued)
- [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
- [Qemu-devel] [PATCH 23/24] curses: build as module, Gerd Hoffmann, 2017/11/17
- [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 <=
- [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
- [Qemu-devel] [PATCH 12/24] vl: drop display_type variable, Gerd Hoffmann, 2017/11/17
- Re: [Qemu-devel] [PATCH 00/24] RfC: rework display initialization, no-reply, 2017/11/17