Merge branch 'master' of https://github.com/doitsujin/dxvk

meson.build

@@ -32,7 +32,13 @@ glsl_generator = generator(glsl_compiler,
   arguments : [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ])
 
 subdir('src')
-if dxvk_compiler.get_id() != 'msvc'
+
+enable_tests = get_option('enable_tests')
+
+if enable_tests
   subdir('tests')
+endif
+
+if dxvk_compiler.get_id() != 'msvc'
   subdir('wine_utils')
 endif

meson_options.txt

@@ -0,0 +1 @@
+option('enable_tests', type : 'boolean', value : false)

package-release.sh

@@ -8,7 +8,7 @@ fi
 DXVK_VERSION="$1"
 DXVK_SRC_DIR=`dirname $(readlink -f $0)`
 DXVK_TMP_DIR="/tmp/dxvk-$DXVK_VERSION"
-DXVK_ARCHIVE_PATH="$2/dxvk-$DXVK_VERSION.tar.gz"
+DXVK_ARCHIVE_PATH=$(realpath "$2")"/dxvk-$DXVK_VERSION.tar.gz"
 
 function build_arch {
   cd "$DXVK_SRC_DIR"
@@ -16,7 +16,9 @@ function build_arch {
   meson --cross-file "$DXVK_SRC_DIR/build-win$1.txt"  \
         --buildtype "release"                         \
         --prefix "$DXVK_TMP_DIR/install.$1"           \
+	--unity off                                   \
         --strip                                       \
+        -Denable_tests=false                          \
         "$DXVK_TMP_DIR/build.$1"
 
   cd "$DXVK_TMP_DIR/build.$1"
@@ -40,4 +42,4 @@ function package {
 
 build_arch 64
 build_arch 32
-package
+package