diff --git a/meson.build b/meson.build index af21a882d..ef521c98e 100644 --- a/meson.build +++ b/meson.build @@ -30,6 +30,7 @@ if meson.get_cross_property('winelib', false) lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ]) exe_ext = '.exe.so' dll_ext = '.dll' + def_spec_ext = '.spec' else lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) lib_d3d11 = dxvk_compiler.find_library('d3d11') @@ -39,6 +40,7 @@ else endif exe_ext = '' dll_ext = '' + def_spec_ext = '.def' endif glsl_compiler = find_program('glslangValidator') diff --git a/src/d3d11/d3d11.spec b/src/d3d11/d3d11.spec new file mode 100644 index 000000000..304e404fe --- /dev/null +++ b/src/d3d11/d3d11.spec @@ -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) diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build index 565356966..8cc9f3ae9 100644 --- a/src/d3d11/meson.build +++ b/src/d3d11/meson.build @@ -34,7 +34,7 @@ d3d11_dll = shared_library('d3d11'+dll_ext, d3d11_src, dependencies : [ dxvk_dep, dxgi_dep, dxbc_dep ], include_directories : dxvk_include_path, install : true, - vs_module_defs : 'd3d11.def', + objects : 'd3d11'+def_spec_ext, override_options : ['cpp_std='+dxvk_cpp_std]) d3d11_dep = declare_dependency( diff --git a/src/dxgi/dxgi.spec b/src/dxgi/dxgi.spec new file mode 100644 index 000000000..acf80ceec --- /dev/null +++ b/src/dxgi/dxgi.spec @@ -0,0 +1,3 @@ +@ stdcall CreateDXGIFactory(ptr ptr) +@ stdcall CreateDXGIFactory1(ptr ptr) +@ stdcall CreateDXGIFactory2(long ptr ptr) diff --git a/src/dxgi/meson.build b/src/dxgi/meson.build index 32742e2c4..8cbb1d75f 100644 --- a/src/dxgi/meson.build +++ b/src/dxgi/meson.build @@ -22,7 +22,7 @@ dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, glsl_generator.process(dxgi_ dependencies : [ dxvk_dep ], include_directories : dxvk_include_path, install : true, - vs_module_defs : 'dxgi'+def_spec_ext, + objects : 'dxgi'+def_spec_ext, override_options : ['cpp_std='+dxvk_cpp_std]) dxgi_dep = declare_dependency(