build: Rename exposed APIs to reflect vkd3d-proton and update to 2.0.
Rename so objects we build so we don't conflict with vkd3d and don't accidentially attempt to be built against Wine natively (it won't work). Not quite ready for a 2.0 release yet, but bump the version to reflect the intent. This creates a new timeline, completely separate from vkd3d. Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
parent
7359720448
commit
8cd30ee1c7
|
@ -2,7 +2,7 @@ vkd3d_utils_src = [
|
|||
'vkd3d_utils_main.c',
|
||||
]
|
||||
|
||||
vkd3d_utils_lib = shared_library('vkd3d-utils', vkd3d_utils_src, vkd3d_headers,
|
||||
vkd3d_utils_lib = shared_library('vkd3d-proton-utils', vkd3d_utils_src, vkd3d_headers,
|
||||
dependencies : vkd3d_dep,
|
||||
include_directories : vkd3d_private_includes,
|
||||
install : true,
|
||||
|
|
|
@ -45,7 +45,7 @@ if enable_renderdoc
|
|||
endif
|
||||
|
||||
if not enable_standalone_d3d12
|
||||
vkd3d_lib = shared_library('vkd3d', vkd3d_src, glsl_generator.process(vkd3d_shaders), vkd3d_build, vkd3d_version, vkd3d_headers,
|
||||
vkd3d_lib = shared_library('vkd3d-proton', vkd3d_src, glsl_generator.process(vkd3d_shaders), vkd3d_build, vkd3d_version, vkd3d_headers,
|
||||
dependencies : [ vkd3d_common_dep, vkd3d_shader_dep ] + vkd3d_extra_libs,
|
||||
include_directories : vkd3d_private_includes,
|
||||
install : true,
|
||||
|
@ -53,7 +53,7 @@ if not enable_standalone_d3d12
|
|||
c_args : '-DVKD3D_EXPORTS',
|
||||
override_options : [ 'c_std='+vkd3d_c_std ])
|
||||
else
|
||||
vkd3d_lib = static_library('vkd3d', vkd3d_src, glsl_generator.process(vkd3d_shaders), vkd3d_build, vkd3d_version, vkd3d_headers,
|
||||
vkd3d_lib = static_library('vkd3d-proton', vkd3d_src, glsl_generator.process(vkd3d_shaders), vkd3d_build, vkd3d_version, vkd3d_headers,
|
||||
dependencies : [ vkd3d_common_dep, vkd3d_shader_dep ] + vkd3d_extra_libs,
|
||||
include_directories : vkd3d_private_includes,
|
||||
override_options : [ 'c_std='+vkd3d_c_std ])
|
||||
|
|
12
meson.build
12
meson.build
|
@ -1,4 +1,4 @@
|
|||
project('vkd3d', ['c'], version : '1.1', meson_version : '>= 0.49', default_options : [
|
||||
project('vkd3d-proton', ['c'], version : '2.0-beta0', meson_version : '>= 0.49', default_options : [
|
||||
'warning_level=2',
|
||||
])
|
||||
|
||||
|
@ -108,12 +108,12 @@ dxil_spirv_dep = dxil_spirv.get_variable('dxil_spirv_dep')
|
|||
|
||||
if vkd3d_platform == 'linux'
|
||||
pkg = import('pkgconfig')
|
||||
vkd3d = library('vkd3d')
|
||||
pkg.generate(vkd3d, filebase : 'libvkd3d', subdirs : 'vkd3d', description : 'The VKD3D 3D Graphics Library')
|
||||
vkd3dutils = library('vkd3d-utils')
|
||||
pkg.generate(vkd3dutils, filebase : 'libvkd3d-utils', subdirs : 'vkd3d', description : 'The VKD3D 3D Graphics Utility Library')
|
||||
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')
|
||||
|
||||
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')
|
||||
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')
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
executable('vkd3d-compiler', 'main.c', vkd3d_headers,
|
||||
executable('vkd3d-proton-compiler', 'main.c', vkd3d_headers,
|
||||
dependencies : [ vkd3d_shader_dep, threads_dep ],
|
||||
include_directories : vkd3d_private_includes,
|
||||
install : true,
|
||||
|
|
Loading…
Reference in New Issue