From a18da4560d2367d6c5242560f7de6dbc81b25793 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Thu, 5 Nov 2020 15:39:43 +0000 Subject: [PATCH] build: Fix pkgconfig and install target Signed-off-by: Joshua Ashton --- meson.build | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index d931df5e..92b1e65a 100644 --- a/meson.build +++ b/meson.build @@ -112,19 +112,17 @@ vkd3d_version = vcs_tag( dxil_spirv = subproject('dxil-spirv') dxil_spirv_dep = dxil_spirv.get_variable('dxil_spirv_dep') +subdir('include') +subdir('libs') + if vkd3d_platform == 'linux' pkg = import('pkgconfig') - vkd3d = library('vkd3d-proton') - pkg.generate(vkd3d, filebase : 'libvkd3d-proton', subdirs : 'vkd3d', description : 'The VKD3D-Proton 3D Graphics Library') - vkd3dutils = library('vkd3d-proton-utils') - pkg.generate(vkd3dutils, filebase : 'libvkd3d-proton-utils', subdirs : 'vkd3d', description : 'The VKD3D-Proton 3D Graphics Utility Library') + pkg.generate(vkd3d_lib, filebase : 'libvkd3d-proton', subdirs : 'vkd3d-proton', description : 'The VKD3D-Proton 3D Graphics Library') + pkg.generate(vkd3d_utils_lib, filebase : 'libvkd3d-proton-utils', subdirs : 'vkd3d-proton', description : 'The VKD3D-Proton 3D Graphics Utility Library') install_headers('include/vkd3d.h', 'include/vkd3d_sonames.h', 'include/vkd3d_types.h', 'include/vkd3d_utils.h', 'include/vkd3d_win32.h', 'include/vkd3d_windows.h', subdir : 'vkd3d-proton') endif -subdir('include') -subdir('libs') - if vkd3d_platform == 'windows' if enable_d3d12 lib_d3d12 = d3d12_dep