[gimp/wip/Jehan/meson-windows-official: 3/14] meson: fix broken directx declare_dependency().
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/meson-windows-official: 3/14] meson: fix broken directx declare_dependency().
- Date: Fri, 1 Apr 2022 15:40:07 +0000 (UTC)
commit b27dd3ddaa4065ca4eb214cd4a18e787788628bf
Author: Jehan <jehan girinstud io>
Date: Wed Mar 30 20:19:00 2022 +0200
meson: fix broken directx declare_dependency().
The `link_with` arg only accept library targets which are the libraries
we build ourselves, whereas dependency objects (such as returned by
cc.find_library()) must be in the `dependencies` arg.
Yes me too, making a difference here kind of stun me a bit and I don't
get why it's needed, but so be it. Since this code dates back from the
original commit, I assume it means the directx option just never worked
with meson on Windows.
Fixes:
> ../meson.build:847:2: ERROR: Entries in "link_with" may only be self-built targets,
> external dependencies (including libraries) must go to "dependencies".
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 58fe2e368b..dd74ad6a59 100644
--- a/meson.build
+++ b/meson.build
@@ -845,8 +845,8 @@ if directx_sdk_path != '' and platform_windows
endif
directx = declare_dependency(
- link_with: cc.find_library('dxguid',
- dirs: directx_sdk_path / 'Lib' / 'x86'),
+ dependencies: cc.find_library('dxguid',
+ dirs: directx_sdk_path / 'Lib' / 'x86'),
include_directories: directx_sdk_path / 'Include',
)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]