mirror of https://github.com/doitsujin/dxvk
[build] Use .spec files instead of .def files in winelib build
This commit is contained in:
parent
635a43fefe
commit
06511aa72c
|
@ -30,6 +30,7 @@ if meson.get_cross_property('winelib', false)
|
||||||
lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ])
|
lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ])
|
||||||
exe_ext = '.exe.so'
|
exe_ext = '.exe.so'
|
||||||
dll_ext = '.dll'
|
dll_ext = '.dll'
|
||||||
|
def_spec_ext = '.spec'
|
||||||
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')
|
||||||
|
@ -39,6 +40,7 @@ else
|
||||||
endif
|
endif
|
||||||
exe_ext = ''
|
exe_ext = ''
|
||||||
dll_ext = ''
|
dll_ext = ''
|
||||||
|
def_spec_ext = '.def'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
glsl_compiler = find_program('glslangValidator')
|
glsl_compiler = find_program('glslangValidator')
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
@ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr)
|
||||||
|
@ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr)
|
|
@ -34,7 +34,7 @@ d3d11_dll = shared_library('d3d11'+dll_ext, d3d11_src,
|
||||||
dependencies : [ dxvk_dep, dxgi_dep, dxbc_dep ],
|
dependencies : [ dxvk_dep, dxgi_dep, dxbc_dep ],
|
||||||
include_directories : dxvk_include_path,
|
include_directories : dxvk_include_path,
|
||||||
install : true,
|
install : true,
|
||||||
vs_module_defs : 'd3d11.def',
|
objects : 'd3d11'+def_spec_ext,
|
||||||
override_options : ['cpp_std='+dxvk_cpp_std])
|
override_options : ['cpp_std='+dxvk_cpp_std])
|
||||||
|
|
||||||
d3d11_dep = declare_dependency(
|
d3d11_dep = declare_dependency(
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
@ stdcall CreateDXGIFactory(ptr ptr)
|
||||||
|
@ stdcall CreateDXGIFactory1(ptr ptr)
|
||||||
|
@ stdcall CreateDXGIFactory2(long ptr ptr)
|
|
@ -22,7 +22,7 @@ dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, glsl_generator.process(dxgi_
|
||||||
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_spec_ext,
|
objects : '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(
|
||||||
|
|
Loading…
Reference in New Issue