mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/gtk: build as module

Browse Source 
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 <kraxel@redhat.com>
Message-id: 20180301100547.18962-11-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:44 +01:00
parent 5f9b1e3506
commit e0fb129c2f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -2558,7 +2558,6 @@ if test "$gtk" != "no"; then
gtk_cflags="$gtk_cflags $x11_cflags" gtk_cflags="$gtk_cflags $x11_cflags"
gtk_libs="$gtk_libs $x11_libs" gtk_libs="$gtk_libs $x11_libs"
fi fi
libs_softmmu="$gtk_libs $libs_softmmu"
gtk="yes" gtk="yes"
elif test "$gtk" = "yes"; then elif test "$gtk" = "yes"; then
feature_not_found "gtk" "Install gtk3-devel" feature_not_found "gtk" "Install gtk3-devel"
@ -2808,7 +2807,6 @@ if test "$vte" != "no"; then
vte_cflags=$($pkg_config --cflags $vtepackage) vte_cflags=$($pkg_config --cflags $vtepackage)
vte_libs=$($pkg_config --libs $vtepackage) vte_libs=$($pkg_config --libs $vtepackage)
vteversion=$($pkg_config --modversion $vtepackage) vteversion=$($pkg_config --modversion $vtepackage)
libs_softmmu="$vte_libs $libs_softmmu"
vte="yes" vte="yes"
elif test "$vte" = "yes"; then elif test "$vte" = "yes"; then
if test "$gtkabi" = "3.0"; 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 echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak
fi fi
if test "$gtk" = "yes" ; then 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 "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
echo "GTK_LIBS=$gtk_libs" >> $config_host_mak echo "GTK_LIBS=$gtk_libs" >> $config_host_mak
@ -6200,6 +6198,7 @@ fi
if test "$vte" = "yes" ; then if test "$vte" = "yes" ; then
echo "CONFIG_VTE=y" >> $config_host_mak echo "CONFIG_VTE=y" >> $config_host_mak
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
echo "VTE_LIBS=$vte_libs" >> $config_host_mak
fi fi
if test "$virglrenderer" = "yes" ; then if test "$virglrenderer" = "yes" ; then
echo "CONFIG_VIRGL=y" >> $config_host_mak echo "CONFIG_VIRGL=y" >> $config_host_mak

17
ui/Makefile.objs
View File

@ -16,7 +16,6 @@ common-obj-$(CONFIG_COCOA) += cocoa.o
common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
common-obj-$(CONFIG_GTK) += gtk.o
common-obj-$(CONFIG_X11) += x_keymap.o common-obj-$(CONFIG_X11) += x_keymap.o
x_keymap.o-cflags := $(X11_CFLAGS) x_keymap.o-cflags := $(X11_CFLAGS)
@ -34,6 +33,12 @@ endif
sdl.mo-cflags := $(SDL_CFLAGS) sdl.mo-cflags := $(SDL_CFLAGS)
sdl.mo-libs := $(SDL_LIBS) 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) ifeq ($(CONFIG_OPENGL),y)
common-obj-y += shader.o common-obj-y += shader.o
common-obj-y += console-gl.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-y += egl-context.o
common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o
ifeq ($(CONFIG_GTK_GL),y) ifeq ($(CONFIG_GTK_GL),y)
common-obj-$(CONFIG_GTK) += gtk-gl-area.o gtk.mo-objs += gtk-gl-area.o
else else
common-obj-$(CONFIG_GTK) += gtk-egl.o gtk.mo-objs += gtk-egl.o
gtk.mo-libs += $(OPENGL_LIBS)
endif endif
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) shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS) console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS) egl-helpers.o-libs += $(OPENGL_LIBS)