diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 9fe6485a..669a38fa 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -54,7 +54,7 @@ jobs: shell: bash run: | export VERSION_NAME="${GITHUB_REF##*/}-${GITHUB_SHA##*/}" - ./package-native.sh ${VERSION_NAME} build --no-package + ./package-native.sh ${VERSION_NAME} build echo "VERSION_NAME=${VERSION_NAME}" >> $GITHUB_ENV - name: Upload artifacts @@ -62,5 +62,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: dxvk-${{ env.VERSION_NAME }} - path: build/dxvk-native-${{ env.VERSION_NAME }} + path: build/dxvk-native-${{ env.VERSION_NAME }}.tar.gz if-no-files-found: error diff --git a/meson.build b/meson.build index 2a263735..0d1c2671 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,8 @@ dep_displayinfo = dependency( ) if platform == 'windows' + dxvk_so_version = {} + compiler_args += [ '-DNOMINMAX', '-D_WIN32_WINNT=0xa00', @@ -119,6 +121,10 @@ if platform == 'windows' dxvk_name_prefix = '' compiler_args += ['-DDXVK_WSI_WIN32'] else + dxvk_abi_version = '0' + dxvk_version = meson.project_version().strip('v').split('.') + dxvk_so_version = {'version': dxvk_abi_version + '.' + dxvk_version[0] + '.' + dxvk_version[1]} + wrc = find_program('touch') wrc_generator = generator(wrc, output : [ '@BASENAME@_ignored.h' ], arguments : [ '@OUTPUT@' ] ) diff --git a/src/d3d10/meson.build b/src/d3d10/meson.build index 51db067c..3d130b32 100644 --- a/src/d3d10/meson.build +++ b/src/d3d10/meson.build @@ -23,6 +23,7 @@ d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_ vs_module_defs : 'd3d10core'+def_spec_ext, link_args : d3d10_core_ld_args, link_depends : [ d3d10_core_link_depends ], + kwargs : dxvk_so_version, ) d3d10_core_dep = declare_dependency( diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build index 9b51e6ea..87b8b19f 100644 --- a/src/d3d11/meson.build +++ b/src/d3d11/meson.build @@ -86,6 +86,7 @@ d3d11_dll = shared_library('d3d11'+dll_ext, dxgi_common_src + d3d11_src + d3d10_ vs_module_defs : 'd3d11'+def_spec_ext, link_args : d3d11_ld_args, link_depends : [ d3d11_link_depends ], + kwargs : dxvk_so_version, ) d3d11_dep = declare_dependency( diff --git a/src/d3d9/meson.build b/src/d3d9/meson.build index dd6b2316..a4a5ee8a 100644 --- a/src/d3d9/meson.build +++ b/src/d3d9/meson.build @@ -65,6 +65,7 @@ d3d9_dll = shared_library('d3d9'+dll_ext, d3d9_src, glsl_generator.process(d3d9_ vs_module_defs : 'd3d9'+def_spec_ext, link_args : d3d9_ld_args, link_depends : [ d3d9_link_depends ], + kwargs : dxvk_so_version, ) d3d9_dep = declare_dependency( diff --git a/src/dxgi/meson.build b/src/dxgi/meson.build index a6e83b54..fda90020 100644 --- a/src/dxgi/meson.build +++ b/src/dxgi/meson.build @@ -29,6 +29,7 @@ dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, dxgi_res, vs_module_defs : 'dxgi'+def_spec_ext, link_args : dxgi_ld_args, link_depends : [ dxgi_link_depends ], + kwargs : dxvk_so_version, ) dxgi_dep = declare_dependency(