rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-30 20:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[build] Explicitly specify .dll and .exe extensions in winelib build

Browse Source 
meson can't handle that itself.
This commit is contained in:
Jacek Caban 2018-07-18 01:29:10 +02:00 committed by Philip Rebohle
parent 2fb0ccae7f
commit 635a43fefe
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -28,6 +28,8 @@ if meson.get_cross_property('winelib', false)
lib_d3d11 = declare_dependency(link_args: [ '-ld3d11' ]) lib_d3d11 = declare_dependency(link_args: [ '-ld3d11' ])
lib_dxgi = declare_dependency(link_args: [ '-ldxgi' ]) lib_dxgi = declare_dependency(link_args: [ '-ldxgi' ])
lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ]) lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ])
exe_ext = '.exe.so'
dll_ext = '.dll'
else else
lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)
lib_d3d11 = dxvk_compiler.find_library('d3d11') lib_d3d11 = dxvk_compiler.find_library('d3d11')
@ -35,6 +37,8 @@ else
if dxvk_compiler.get_id() != 'msvc' if dxvk_compiler.get_id() != 'msvc'
lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47') lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
endif endif
exe_ext = ''
dll_ext = ''
endif endif
glsl_compiler = find_program('glslangValidator') glsl_compiler = find_program('glslangValidator')

2
src/d3d11/meson.build
View File

@ -28,7 +28,7 @@ d3d11_src = [
'd3d11_view_uav.cpp', 'd3d11_view_uav.cpp',
] ]
d3d11_dll = shared_library('d3d11', d3d11_src, d3d11_dll = shared_library('d3d11'+dll_ext, d3d11_src,
name_prefix : '', name_prefix : '',
link_with : [ util_lib ], link_with : [ util_lib ],
dependencies : [ dxvk_dep, dxgi_dep, dxbc_dep ], dependencies : [ dxvk_dep, dxgi_dep, dxbc_dep ],

4
src/dxgi/meson.build
View File

@ -16,13 +16,13 @@ dxgi_src = [
'dxgi_swapchain.cpp', '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 : '', name_prefix : '',
link_with : [ util_lib ], link_with : [ util_lib ],
dependencies : [ dxvk_dep ], dependencies : [ dxvk_dep ],
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
vs_module_defs : 'dxgi.def', vs_module_defs : 'dxgi'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])
dxgi_dep = declare_dependency( dxgi_dep = declare_dependency(

8
tests/d3d11/meson.build
View File

@ -1,6 +1,6 @@
test_d3d11_deps = [ util_dep, lib_dxgi, lib_d3d11, lib_d3dcompiler_47 ] 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-compute'+exe_ext, 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-formats'+exe_ext, 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-streamout'+exe_ext, 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]) executable('d3d11-triangle'+exe_ext, files('test_d3d11_triangle.cpp'), dependencies : test_d3d11_deps, install : true, override_options: ['cpp_std='+dxvk_cpp_std])

7
tests/dxbc/meson.build
View File

@ -1,5 +1,6 @@
test_dxbc_deps = [ dxbc_dep, dxvk_dep ] 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-compiler'+exe_ext, 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('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', files('test_hlsl_compiler.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])

2
tests/dxgi/meson.build
View File

@ -1,3 +1,3 @@
test_dxgi_deps = [ util_dep, lib_dxgi ] 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]) executable('dxgi-factory'+exe_ext, files('test_dxgi_factory.cpp'), dependencies : test_dxgi_deps, install: true, override_options: ['cpp_std='+dxvk_cpp_std])