From 560cdabebe18ebe50e3c33d716e2aa82603dbb38 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 18 Apr 2018 13:27:13 -0700 Subject: [PATCH] meson: build gallium gdi winsys v6: - use null_dep instead of [] Reviewed-by: Eric Anholt (v5) Acked-by: Kristian H. Kristensen --- src/gallium/meson.build | 6 ++++++ src/gallium/winsys/sw/gdi/meson.build | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 src/gallium/winsys/sw/gdi/meson.build diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 2344bf3e88b..193a1e0f1c6 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -21,6 +21,7 @@ inc_gallium_drivers = include_directories('drivers') inc_gallium_winsys = include_directories('winsys') +inc_gallium_winsys_sw = include_directories('winsys/sw') subdir('auxiliary') subdir('auxiliary/pipe-loader') @@ -35,6 +36,11 @@ if with_gallium_drisw_kms else libswkmsdri = [] endif +if with_platform_windows + subdir('winsys/sw/gdi') +else + libwsgdi = null_dep +endif subdir('winsys/sw/wrapper') if with_platform_haiku subdir('winsys/sw/hgl') diff --git a/src/gallium/winsys/sw/gdi/meson.build b/src/gallium/winsys/sw/gdi/meson.build new file mode 100644 index 00000000000..ac6c7cf0aa2 --- /dev/null +++ b/src/gallium/winsys/sw/gdi/meson.build @@ -0,0 +1,27 @@ +# Copyright © 2018 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +libwsgdi = static_library( + 'wsgdi', + 'gdi_sw_winsys.c', + include_directories : [ + inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, + ], +)