From 635a43fefe8152d879abee6b68598d3b7322081b Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 18 Jul 2018 01:29:10 +0200 Subject: [PATCH] [build] Explicitly specify .dll and .exe extensions in winelib build meson can't handle that itself. --- meson.build | 4 ++++ src/d3d11/meson.build | 2 +- src/dxgi/meson.build | 4 ++-- tests/d3d11/meson.build | 8 ++++---- tests/dxbc/meson.build | 7 ++++--- tests/dxgi/meson.build | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 878634481..af21a882d 100644 --- a/meson.build +++ b/meson.build @@ -28,6 +28,8 @@ if meson.get_cross_property('winelib', false) lib_d3d11 = declare_dependency(link_args: [ '-ld3d11' ]) lib_dxgi = declare_dependency(link_args: [ '-ldxgi' ]) lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ]) + exe_ext = '.exe.so' + dll_ext = '.dll' else lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) lib_d3d11 = dxvk_compiler.find_library('d3d11') @@ -35,6 +37,8 @@ else if dxvk_compiler.get_id() != 'msvc' lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47') endif + exe_ext = '' + dll_ext = '' endif glsl_compiler = find_program('glslangValidator') diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build index 802afd03e..565356966 100644 --- a/src/d3d11/meson.build +++ b/src/d3d11/meson.build @@ -28,7 +28,7 @@ d3d11_src = [ 'd3d11_view_uav.cpp', ] -d3d11_dll = shared_library('d3d11', d3d11_src, +d3d11_dll = shared_library('d3d11'+dll_ext, d3d11_src, name_prefix : '', link_with : [ util_lib ], dependencies : [ dxvk_dep, dxgi_dep, dxbc_dep ], diff --git a/src/dxgi/meson.build b/src/dxgi/meson.build index 5dfc33478..32742e2c4 100644 --- a/src/dxgi/meson.build +++ b/src/dxgi/meson.build @@ -16,13 +16,13 @@ dxgi_src = [ 'dxgi_swapchain.cpp', ] -dxgi_dll = shared_library('dxgi', dxgi_src, glsl_generator.process(dxgi_shaders), +dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, glsl_generator.process(dxgi_shaders), name_prefix : '', link_with : [ util_lib ], dependencies : [ dxvk_dep ], include_directories : dxvk_include_path, install : true, - vs_module_defs : 'dxgi.def', + vs_module_defs : 'dxgi'+def_spec_ext, override_options : ['cpp_std='+dxvk_cpp_std]) dxgi_dep = declare_dependency( diff --git a/tests/d3d11/meson.build b/tests/d3d11/meson.build index eb7ccb65a..ac3cf0ff4 100644 --- a/tests/d3d11/meson.build +++ b/tests/d3d11/meson.build @@ -1,6 +1,6 @@ test_d3d11_deps = [ util_dep, lib_dxgi, lib_d3d11, lib_d3dcompiler_47 ] -executable('d3d11-compute', files('test_d3d11_compute.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) -executable('d3d11-formats', files('test_d3d11_formats.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) -executable('d3d11-streamout', files('test_d3d11_streamout.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) -executable('d3d11-triangle', files('test_d3d11_triangle.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) \ No newline at end of file +executable('d3d11-compute'+exe_ext, files('test_d3d11_compute.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) +executable('d3d11-formats'+exe_ext, files('test_d3d11_formats.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) +executable('d3d11-streamout'+exe_ext, files('test_d3d11_streamout.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) +executable('d3d11-triangle'+exe_ext, files('test_d3d11_triangle.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) diff --git a/tests/dxbc/meson.build b/tests/dxbc/meson.build index 4b207fcab..237822274 100644 --- a/tests/dxbc/meson.build +++ b/tests/dxbc/meson.build @@ -1,5 +1,6 @@ test_dxbc_deps = [ dxbc_dep, dxvk_dep ] -executable('dxbc-compiler', files('test_dxbc_compiler.cpp'), dependencies : test_dxbc_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) -executable('dxbc-disasm', files('test_dxbc_disasm.cpp'), dependencies : [ test_dxbc_deps, lib_d3dcompiler_47 ], install : true, override_options: ['cpp_std='+dxvk_cpp_std]) -executable('hlsl-compiler', files('test_hlsl_compiler.cpp'), dependencies : [ test_dxbc_deps, lib_d3dcompiler_47 ], install : true, override_options: ['cpp_std='+dxvk_cpp_std]) +executable('dxbc-compiler'+exe_ext, files('test_dxbc_compiler.cpp'), dependencies : test_dxbc_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std]) +executable('dxbc-disasm'+exe_ext, files('test_dxbc_disasm.cpp'), dependencies : [ test_dxbc_deps, lib_d3dcompiler_47 ], install : true, override_options: ['cpp_std='+dxvk_cpp_std]) +executable('hlsl-compiler'+exe_ext, files('test_hlsl_compiler.cpp'), dependencies : [ test_dxbc_deps, lib_d3dcompiler_47 ], install : true, override_options: ['cpp_std='+dxvk_cpp_std]) + diff --git a/tests/dxgi/meson.build b/tests/dxgi/meson.build index 2b18759b2..375323b13 100644 --- a/tests/dxgi/meson.build +++ b/tests/dxgi/meson.build @@ -1,3 +1,3 @@ test_dxgi_deps = [ util_dep, lib_dxgi ] -executable('dxgi-factory', files('test_dxgi_factory.cpp'), dependencies : test_dxgi_deps, install: true, override_options: ['cpp_std='+dxvk_cpp_std]) \ No newline at end of file +executable('dxgi-factory'+exe_ext, files('test_dxgi_factory.cpp'), dependencies : test_dxgi_deps, install: true, override_options: ['cpp_std='+dxvk_cpp_std])