From nobody Mon Feb 9 18:46:24 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597398704; cv=none; d=zohomail.com; s=zohoarc; b=gRGNrNSdG3F0L3X1xbPHgGYoYzu6HUf2xIMHm1SHlWYUVIGG6ayGhuyIW+o9bc5mwHtWQuG4e0gK5983RsaFwbosIDAb8g/Oty8ZnjTAu1epVURJUyiEflwZH7FCbg2A/fheuc/vgyztmOUxtqnr3+2TdGsIomib5kaorsb5ZSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597398704; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OWxieg1J0Lo/Wcd3zSKFo8OXKwQ3vTNWdGpRN3Orz0w=; b=a5StfOYJxmPW8cLmmPPxhcjHWr/zgNUb9ZjsjcNBP2e9YQkm5BAGwNmTSsc8AtdTBQ3xqVr8W8LJ/zoBvhpBzMLkSi4GBUGP6n1F759Zq+YUNbnpnDEtyxRt4HnePSaZG/aATMDWKv6fovCY54xmDAhznALfmhOuXW0LTtKX9yI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597398704908918.7074698548131; Fri, 14 Aug 2020 02:51:44 -0700 (PDT) Received: from localhost ([::1]:33934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6WNC-0000gO-6P for importer@patchew.org; Fri, 14 Aug 2020 05:51:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6VnG-0006cx-4U for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:14:34 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:57209 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k6Vn9-00030e-Fv for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:14:33 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-518-GVERgvL6NjCuFL7pBbhvQg-1; Fri, 14 Aug 2020 05:14:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04BBF1005E5A for ; Fri, 14 Aug 2020 09:14:21 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6F40747B9; Fri, 14 Aug 2020 09:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597396466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OWxieg1J0Lo/Wcd3zSKFo8OXKwQ3vTNWdGpRN3Orz0w=; b=AKAZC8tMp8e8D9cFsAthw6PbLQL5/RyRFXr/DUwwuSdaLDbpHF0PliFocUXqWYBxFC6vAG ODkPB3Pzo4HGTCmhwcdmZ2NCYYmNdhB8r3PUreCUI15Cuz/hB4giwgYZpPCEdUNScVM6cb ncEh+BsHtu+eqDhKHXQjluXMzn2K2e0= X-MC-Unique: GVERgvL6NjCuFL7pBbhvQg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 071/150] meson: convert ui directory to Meson Date: Fri, 14 Aug 2020 05:12:07 -0400 Message-Id: <20200814091326.16173-72-pbonzini@redhat.com> In-Reply-To: <20200814091326.16173-1-pbonzini@redhat.com> References: <20200814091326.16173-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 01:57:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 8 +++-- Makefile.target | 8 ++--- configure | 6 ++++ meson.build | 50 +++++++++++++++++++++++++++++ ui/Makefile.objs | 73 ------------------------------------------ ui/meson.build | 83 +++++++++++++++++++++++++++++++++++++++++++++++- ui/shader.c | 6 ++-- 7 files changed, 150 insertions(+), 84 deletions(-) delete mode 100644 ui/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index ec7627a4c6..72e935023d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -68,6 +68,11 @@ common-obj-$(CONFIG_AUDIO_OSS) +=3D audio-oss$(DSOSUF) common-obj-$(CONFIG_AUDIO_PA) +=3D audio-pa$(DSOSUF) common-obj-$(CONFIG_AUDIO_SDL) +=3D audio-sdl$(DSOSUF) =20 +common-obj-$(if $(CONFIG_CURSES),m) +=3D ui-curses$(DSOSUF) +common-obj-$(if $(CONFIG_GTK),m) +=3D ui-gtk$(DSOSUF) +common-obj-$(if $(CONFIG_SDL),m) +=3D ui-sdl$(DSOSUF) +common-obj-$(if $(CONFIG_SPICE),m) +=3D ui-spice-app$(DSOSUF) + common-obj-$(if $(CONFIG_CURL),m) +=3D block-curl$(DSOSUF) common-obj-$(if $(CONFIG_GLUSTERFS),m) +=3D block-gluster$(DSOSUF) common-obj-$(if $(CONFIG_LIBISCSI),m) +=3D block-iscsi$(DSOSUF) @@ -83,9 +88,6 @@ common-obj-m +=3D hw/ =20 common-obj-y +=3D replay/ =20 -common-obj-y +=3D ui/ -common-obj-m +=3D ui/ - common-obj-y +=3D dma-helpers.o common-obj-$(CONFIG_TPM) +=3D tpm.o =20 diff --git a/Makefile.target b/Makefile.target index ff0e1b2d10..16f1e781e9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -167,8 +167,9 @@ LIBS :=3D $(libs_softmmu) $(LIBS) LIBS :=3D $(LIBS) @../block.syms @../qemu.syms ifneq ($(CONFIG_MODULES),y) LIBS :=3D $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS) +LIBS :=3D $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICO= NV_LIBS) $(GIO_LIBS) endif -LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) +LIBS :=3D $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) LIBS :=3D $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS) =20 # Hardware support @@ -207,9 +208,8 @@ dummy :=3D $(call fix-paths,../,, \ crypto-obj-y \ io-obj-y \ qom-obj-y) -dummy :=3D $(call unnest-vars,.., \ - common-obj-y \ - common-obj-m) +dummy :=3D $(call unnest-vars,..,common-obj-y) + all-obj-y +=3D $(common-obj-y) all-obj-y +=3D $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(authz-obj-y) diff --git a/configure b/configure index 171a1c71d2..26d2479b80 100755 --- a/configure +++ b/configure @@ -7020,12 +7020,18 @@ fi if test "$vnc_sasl" =3D "yes" ; then echo "CONFIG_VNC_SASL=3Dy" >> $config_host_mak fi +echo "SASL_CFLAGS=3D$vnc_sasl_cflags" >> $config_host_mak +echo "SASL_LIBS=3D$vnc_sasl_libs" >> $config_host_mak if test "$vnc_jpeg" =3D "yes" ; then echo "CONFIG_VNC_JPEG=3Dy" >> $config_host_mak fi +echo "JPEG_CFLAGS=3D$vnc_jpeg_cflags" >> $config_host_mak +echo "JPEG_LIBS=3D$vnc_jpeg_libs" >> $config_host_mak if test "$vnc_png" =3D "yes" ; then echo "CONFIG_VNC_PNG=3Dy" >> $config_host_mak fi +echo "PNG_CFLAGS=3D$vnc_png_cflags" >> $config_host_mak +echo "PNG_LIBS=3D$vnc_png_libs" >> $config_host_mak if test "$xkbcommon" =3D "yes" ; then echo "CONFIG_XKBCOMMON=3Dy" >> $config_host_mak echo "XKBCOMMON_CFLAGS=3D$xkbcommon_cflags" >> $config_host_mak diff --git a/meson.build b/meson.build index 98182049d8..db5a000a23 100644 --- a/meson.build +++ b/meson.build @@ -239,6 +239,56 @@ coreaudio =3D not_found if 'CONFIG_AUDIO_COREAUDIO' in config_host coreaudio =3D declare_dependency(link_args: config_host['COREAUDIO_LIBS'= ].split()) endif +opengl =3D not_found +if 'CONFIG_OPENGL' in config_host + opengl =3D declare_dependency(link_args: config_host['OPENGL_LIBS'].spli= t()) +else +endif +gtk =3D not_found +if 'CONFIG_GTK' in config_host + gtk =3D declare_dependency(compile_args: config_host['GTK_CFLAGS'].split= (), + link_args: config_host['GTK_LIBS'].split()) +endif +vte =3D not_found +if 'CONFIG_VTE' in config_host + vte =3D declare_dependency(compile_args: config_host['VTE_CFLAGS'].split= (), + link_args: config_host['VTE_LIBS'].split()) +endif +x11 =3D not_found +if 'CONFIG_X11' in config_host + x11 =3D declare_dependency(compile_args: config_host['X11_CFLAGS'].split= (), + link_args: config_host['X11_LIBS'].split()) +endif +curses =3D not_found +if 'CONFIG_CURSES' in config_host + curses =3D declare_dependency(compile_args: config_host['CURSES_CFLAGS']= .split(), + link_args: config_host['CURSES_LIBS'].split(= )) +endif +iconv =3D not_found +if 'CONFIG_ICONV' in config_host + iconv =3D declare_dependency(compile_args: config_host['ICONV_CFLAGS'].s= plit(), + link_args: config_host['ICONV_LIBS'].split()) +endif +gio =3D not_found +if 'CONFIG_GIO' in config_host + gio =3D declare_dependency(compile_args: config_host['GIO_CFLAGS'].split= (), + link_args: config_host['GIO_LIBS'].split()) +endif +png =3D not_found +if 'CONFIG_VNC_PNG' in config_host + png =3D declare_dependency(compile_args: config_host['PNG_CFLAGS'].split= (), + link_args: config_host['PNG_LIBS'].split()) +endif +jpeg =3D not_found +if 'CONFIG_VNC_JPEG' in config_host + jpeg =3D declare_dependency(compile_args: config_host['JPEG_CFLAGS'].spl= it(), + link_args: config_host['JPEG_LIBS'].split()) +endif +sasl =3D not_found +if 'CONFIG_VNC_SASL' in config_host + sasl =3D declare_dependency(compile_args: config_host['SASL_CFLAGS'].spl= it(), + link_args: config_host['SASL_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') diff --git a/ui/Makefile.objs b/ui/Makefile.objs deleted file mode 100644 index 504b196479..0000000000 --- a/ui/Makefile.objs +++ /dev/null @@ -1,73 +0,0 @@ -vnc-obj-y +=3D vnc.o -vnc-obj-y +=3D vnc-enc-zlib.o vnc-enc-hextile.o -vnc-obj-y +=3D vnc-enc-tight.o vnc-palette.o -vnc-obj-y +=3D vnc-enc-zrle.o -vnc-obj-y +=3D vnc-auth-vencrypt.o -vnc-obj-$(CONFIG_VNC_SASL) +=3D vnc-auth-sasl.o -vnc-obj-y +=3D vnc-ws.o -vnc-obj-y +=3D vnc-jobs.o - -common-obj-y +=3D keymaps.o console.o cursor.o qemu-pixman.o -common-obj-y +=3D input.o input-keymap.o input-legacy.o kbd-state.o -common-obj-y +=3D input-barrier.o -common-obj-$(CONFIG_LINUX) +=3D input-linux.o -common-obj-$(CONFIG_SPICE) +=3D spice-core.o spice-input.o spice-display.o -common-obj-$(CONFIG_COCOA) +=3D cocoa.o -common-obj-$(CONFIG_VNC) +=3D $(vnc-obj-y) -common-obj-$(call lnot,$(CONFIG_VNC)) +=3D vnc-stubs.o -ifneq (,$(findstring m,$(CONFIG_SDL)$(CONFIG_GTK))) -common-obj-$(CONFIG_WIN32) +=3D win32-kbd-hook.o -endif - -# ui-sdl module -common-obj-$(CONFIG_SDL) +=3D sdl.mo -sdl.mo-objs :=3D sdl2.o sdl2-input.o sdl2-2d.o -ifeq ($(CONFIG_OPENGL),y) -sdl.mo-objs +=3D sdl2-gl.o -endif -sdl.mo-cflags :=3D $(SDL_CFLAGS) -sdl.mo-libs :=3D $(SDL_LIBS) - -# ui-gtk module -common-obj-$(CONFIG_GTK) +=3D gtk.mo -gtk.mo-objs :=3D gtk.o -gtk.mo-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) -gtk.mo-libs :=3D $(GTK_LIBS) $(VTE_LIBS) -ifeq ($(CONFIG_OPENGL),y) -gtk.mo-objs +=3D gtk-egl.o -gtk.mo-libs +=3D $(OPENGL_LIBS) -ifeq ($(CONFIG_GTK_GL),y) -gtk.mo-objs +=3D gtk-gl-area.o -endif -endif - -ifeq ($(CONFIG_X11),y) -sdl.mo-objs +=3D x_keymap.o -gtk.mo-objs +=3D x_keymap.o -x_keymap.o-cflags :=3D $(X11_CFLAGS) -x_keymap.o-libs :=3D $(X11_LIBS) -endif - -common-obj-$(CONFIG_CURSES) +=3D curses.mo -curses.mo-objs :=3D curses.o -curses.mo-cflags :=3D $(CURSES_CFLAGS) $(ICONV_CFLAGS) -curses.mo-libs :=3D $(CURSES_LIBS) $(ICONV_LIBS) - -ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) -common-obj-$(if $(CONFIG_MODULES),m,y) +=3D spice-app.mo -endif -spice-app.mo-objs :=3D spice-app.o -spice-app.mo-cflags :=3D $(GIO_CFLAGS) -spice-app.mo-libs :=3D $(GIO_LIBS) - -common-obj-$(CONFIG_OPENGL) +=3D shader.o -common-obj-$(CONFIG_OPENGL) +=3D console-gl.o -common-obj-$(CONFIG_OPENGL) +=3D egl-helpers.o -common-obj-$(CONFIG_OPENGL) +=3D egl-context.o -common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o - -shader.o-libs +=3D $(OPENGL_LIBS) -console-gl.o-libs +=3D $(OPENGL_LIBS) -egl-helpers.o-libs +=3D $(OPENGL_LIBS) -egl-context.o-libs +=3D $(OPENGL_LIBS) -egl-headless.o-libs +=3D $(OPENGL_LIBS) diff --git a/ui/meson.build b/ui/meson.build index 35da0d8d26..d9c70661cd 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,3 +1,83 @@ +softmmu_ss.add(files( + 'console.c', + 'cursor.c', + 'input-keymap.c', + 'input-legacy.c', + 'input-barrier.c', + 'input.c', + 'kbd-state.c', + 'keymaps.c', + 'qemu-pixman.c', +)) +softmmu_ss.add(pixman) + +softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) +softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice= -input.c', 'spice-display.c')) +softmmu_ss.add(when: [cocoa, 'CONFIG_COCOA'], if_true: files('cocoa.m')) + +vnc_ss =3D ss.source_set() +vnc_ss.add(files( + 'vnc.c', + 'vnc-enc-zlib.c', + 'vnc-enc-hextile.c', + 'vnc-enc-tight.c', + 'vnc-palette.c', + 'vnc-enc-zrle.c', + 'vnc-auth-vencrypt.c', + 'vnc-ws.c', + 'vnc-jobs.c', +)) +vnc_ss.add(zlib) +vnc_ss.add(when: 'CONFIG_VNC_SASL', if_true: [files('vnc-auth-sasl.c'), sa= sl]) +softmmu_ss.add_all(when: 'CONFIG_VNC', if_true: vnc_ss) +softmmu_ss.add(when: 'CONFIG_VNC', if_false: files('vnc-stubs.c')) +softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('shader.c',= 'console-gl.c', 'egl-helpers.c', 'egl-context.c')) +softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL_DMABUF'], if_true: files('egl= -headless.c')) +softmmu_ss.add(when: 'CONFIG_VNC_PNG', if_true: png) +softmmu_ss.add(when: 'CONFIG_VNC_JPEG', if_true: jpeg) + +ui_modules =3D [] + +if config_host.has_key('CONFIG_CURSES') + ui_modules +=3D [['curses', files('curses.c'), [curses, iconv]]] +endif + +if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE') + softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) + + gtk_ss =3D ss.source_set() + gtk_ss.add(gtk, vte, files('gtk.c')) + gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c')) + gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.= c')) + gtk_ss =3D gtk_ss.apply(config_host, strict: false) + ui_modules +=3D [['gtk', gtk_ss.sources(), gtk_ss.dependencies()]] +endif + +if config_host.has_key('CONFIG_SDL') + softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) + + sdl_ss =3D ss.source_set() + sdl_ss.add(pixman, glib, files( + 'sdl2-2d.c', + 'sdl2-input.c', + 'sdl2.c', + )) + sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c')) + sdl_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + sdl_ss =3D sdl_ss.apply(config_host, strict: false) + ui_modules +=3D [['sdl', sdl_ss.sources(), sdl_ss.dependencies()]] +endif + +if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO= ') + spice_ss =3D ss.source_set() + spice_ss.add(spice, gio, files('spice-app.c')) + spice_ss =3D spice_ss.apply(config_host, strict: false) + ui_modules +=3D [['spice-app', spice_ss.sources(), spice_ss.dependencies= ()]] +endif + +keymap_gen =3D find_program('keycodemapdb/tools/keymap-gen') + keymaps =3D [ ['atset1', 'qcode'], ['linux', 'qcode'], @@ -24,7 +104,6 @@ if have_system genh +=3D custom_target(output, output: output, capture: true, - build_by_default: true, # to be removed when added to a = target input: files('keycodemapdb/data/keymaps.csv'), command: [python.full_path(), files('keycodemapdb/tools/= keymap-gen'), '--lang', 'glib2', @@ -34,3 +113,5 @@ if have_system endif =20 subdir('shader') + +modules +=3D {'ui': ui_modules} diff --git a/ui/shader.c b/ui/shader.c index d78829f43b..e8b8d321b7 100644 --- a/ui/shader.c +++ b/ui/shader.c @@ -27,9 +27,9 @@ #include "qemu/osdep.h" #include "ui/shader.h" =20 -#include "shader/texture-blit-vert.h" -#include "shader/texture-blit-flip-vert.h" -#include "shader/texture-blit-frag.h" +#include "ui/shader/texture-blit-vert.h" +#include "ui/shader/texture-blit-flip-vert.h" +#include "ui/shader/texture-blit-frag.h" =20 struct QemuGLShader { GLint texture_blit_prog; --=20 2.26.2