diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92881edb01..d77a03d079 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,4 +5,4 @@ d9vk: artifacts: name: "d9vk-${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}" paths: - - build/dxvk-release \ No newline at end of file + - build/d9vk-release \ No newline at end of file diff --git a/RELEASE b/RELEASE index 347f5833ee..e346294060 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -1.4.1 +0.22 diff --git a/meson.build b/meson.build index e8d12933fa..72066aaae1 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('dxvk', ['c', 'cpp'], version : 'v1.4.1', meson_version : '>= 0.46') +project('dxvk', ['c', 'cpp'], version : '0.22', meson_version : '>= 0.46') cpu_family = target_machine.cpu_family() diff --git a/package-release.sh b/package-release.sh index 79c23d5655..df64cf1233 100755 --- a/package-release.sh +++ b/package-release.sh @@ -11,8 +11,8 @@ fi DXVK_VERSION="$1" DXVK_SRC_DIR=`dirname $(readlink -f $0)` -DXVK_BUILD_DIR=$(realpath "$2")"/dxvk-$DXVK_VERSION" -DXVK_ARCHIVE_PATH=$(realpath "$2")"/dxvk-$DXVK_VERSION.tar.gz" +DXVK_BUILD_DIR=$(realpath "$2")"/d9vk-$DXVK_VERSION" +DXVK_ARCHIVE_PATH=$(realpath "$2")"/d9vk-$DXVK_VERSION.tar.gz" if [ -e "$DXVK_BUILD_DIR" ]; then echo "Build directory $DXVK_BUILD_DIR already exists" @@ -81,8 +81,8 @@ function build_script { function package { cd "$DXVK_BUILD_DIR/.." - tar -czf "$DXVK_ARCHIVE_PATH" "dxvk-$DXVK_VERSION" - rm -R "dxvk-$DXVK_VERSION" + tar -czf "$DXVK_ARCHIVE_PATH" "d9vk-$DXVK_VERSION" + rm -R "d9vk-$DXVK_VERSION" } build_arch 64 diff --git a/version.h.in b/version.h.in index e9cc1c3a2e..3d7216132b 100644 --- a/version.h.in +++ b/version.h.in @@ -1,3 +1,3 @@ #pragma once -#define DXVK_VERSION "@VCS_TAG@" +#define DXVK_VERSION "d9vk-@VCS_TAG@-kerokero"