[meta] Remove support for winelib builds

Untested, unmaintained, and constantly causing issues on various
setups for no apparent reason. Time to get rid of it for good.

Closes #1584.

README.md

@@ -53,8 +53,6 @@ cd /your/target/directory/build.64
 ninja install
 ```
 
-A winelib build can be created by adding the `--winelib` argument.
-
 #### Compiling manually
 ```
 # 64-bit build. For 32-bit builds, replace

build-wine32.txt

@@ -1,19 +0,0 @@
-[binaries]
-c = 'winegcc'
-cpp = 'wineg++'
-ar = 'ar'
-strip = 'strip'
-
-[properties]
-needs_exe_wrapper = true
-
-c_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden']
-cpp_args=['-m32', '-msse', '-msse2', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
-cpp_link_args=['-m32', '-mwindows']
-
-[host_machine]
-system = 'linux'
-cpu_family = 'x86'
-cpu = 'i686'
-endian = 'little'
-

build-wine64.txt

@@ -1,19 +0,0 @@
-[binaries]
-c = 'winegcc'
-cpp = 'wineg++'
-ar = 'ar'
-strip = 'strip'
-
-[properties]
-needs_exe_wrapper = true
-
-c_args=['-m64', '-fvisibility=hidden']
-cpp_args=['-m64', '-fvisibility=hidden', '-fvisibility-inlines-hidden', '-D__WIDL_objidl_generated_name_0000000C=']
-cpp_link_args=['-m64', '-mwindows']
-
-[host_machine]
-system = 'linux'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-

meson.build

@@ -25,67 +25,44 @@ else
   dxvk_library_path = meson.source_root() + '/lib32'
 endif
 
-code = '''#ifndef __WINE__
-#error 1
-#endif'''
-
-dxvk_winelib = dxvk_compiler.compiles(code, name: 'winelib check')
 dxvk_extradep = [ ]
 
-if dxvk_winelib
-  if dxvk_compiler.has_argument('--no-gnu-unique')
-    add_project_arguments('--no-gnu-unique', language : ['cpp'])
-  endif
-  wrc = find_program('wrc')
-  lib_vulkan  = declare_dependency(link_args: [ '-lwinevulkan' ])
-  lib_d3d9    = declare_dependency(link_args: [ '-ld3d9' ])
-  lib_d3d11   = declare_dependency(link_args: [ '-ld3d11' ])
-  lib_dxgi    = declare_dependency(link_args: [ '-ldxgi' ])
-  lib_d3dcompiler_43 = declare_dependency(link_args: [ '-L'+dxvk_library_path, '-ld3dcompiler_43' ])
-  lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler' ])
-  dxvk_extradep += [ declare_dependency(link_args: [ '-ldl' ]) ]
-  exe_ext = '.exe.so'
-  dll_ext = '.dll'
-  res_ext = '.res'
-  def_spec_ext = '.spec'
+if dxvk_compiler.get_id() == 'msvc'
+  wrc = find_program('rc')
 else
-  if dxvk_compiler.get_id() == 'msvc'
-    wrc = find_program('rc')
-  else
-    wrc = cpu_family == 'x86_64' ? find_program('x86_64-w64-mingw32-windres') : find_program('i686-w64-mingw32-windres')
-  endif
-  if cpu_family == 'x86'
-    if dxvk_compiler.has_link_argument('-Wl,--add-stdcall-alias')
-      add_global_link_arguments('-Wl,--add-stdcall-alias', language: 'cpp')
-    endif
-    if dxvk_compiler.has_link_argument('-Wl,--enable-stdcall-fixup')
-      add_global_link_arguments('-Wl,--enable-stdcall-fixup', language: 'cpp')
-    endif
-  endif
-
-  lib_vulkan  = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)
-  lib_d3d9    = dxvk_compiler.find_library('d3d9')
-  lib_d3d11   = dxvk_compiler.find_library('d3d11')
-  lib_dxgi    = dxvk_compiler.find_library('dxgi')
-  lib_d3dcompiler_43 = dxvk_compiler.find_library('d3dcompiler_43', dirs : dxvk_library_path)
-
-  if dxvk_compiler.get_id() == 'msvc'
-    lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler')
-  else
-    lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
-  endif
-
-  exe_ext = ''
-  dll_ext = ''
-
-  if dxvk_compiler.get_id() == 'msvc'
-    res_ext = '.res'
-  else
-    res_ext = '.o'
-  endif
-
-  def_spec_ext = '.def'
+  wrc = cpu_family == 'x86_64' ? find_program('x86_64-w64-mingw32-windres') : find_program('i686-w64-mingw32-windres')
 endif
+if cpu_family == 'x86'
+  if dxvk_compiler.has_link_argument('-Wl,--add-stdcall-alias')
+    add_global_link_arguments('-Wl,--add-stdcall-alias', language: 'cpp')
+  endif
+  if dxvk_compiler.has_link_argument('-Wl,--enable-stdcall-fixup')
+    add_global_link_arguments('-Wl,--enable-stdcall-fixup', language: 'cpp')
+  endif
+endif
+
+lib_vulkan  = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)
+lib_d3d9    = dxvk_compiler.find_library('d3d9')
+lib_d3d11   = dxvk_compiler.find_library('d3d11')
+lib_dxgi    = dxvk_compiler.find_library('dxgi')
+lib_d3dcompiler_43 = dxvk_compiler.find_library('d3dcompiler_43', dirs : dxvk_library_path)
+
+if dxvk_compiler.get_id() == 'msvc'
+  lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler')
+else
+  lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
+endif
+
+exe_ext = ''
+dll_ext = ''
+
+if dxvk_compiler.get_id() == 'msvc'
+  res_ext = '.res'
+else
+  res_ext = '.o'
+endif
+
+def_spec_ext = '.def'
 
 glsl_compiler = find_program('glslangValidator')
 glsl_generator = generator(glsl_compiler,

package-release.sh

@@ -5,7 +5,7 @@ set -e
 shopt -s extglob
 
 if [ -z "$1" ] || [ -z "$2" ]; then
-  echo "Usage: $0 version destdir [--no-package] [--dev-build] [--winelib]"
+  echo "Usage: $0 version destdir [--no-package] [--dev-build]"
   exit 1
 fi
 
@@ -23,7 +23,6 @@ shift 2
 
 opt_nopackage=0
 opt_devbuild=0
-opt_winelib=0
 
 crossfile="build-win"
 
@@ -36,10 +35,6 @@ while [ $# -gt 0 ]; do
     opt_nopackage=1
     opt_devbuild=1
     ;;
-  "--winelib")
-    opt_winelib=1
-    crossfile="build-wine"
-    ;;
   *)
     echo "Unrecognized option: $1" >&2
     exit 1
@@ -66,10 +61,6 @@ function build_arch {
   ninja install
 
   if [ $opt_devbuild -eq 0 ]; then
-    if [ $opt_winelib -eq 0 ]; then
-      # get rid of some useless .a files
-      rm "$DXVK_BUILD_DIR/x$1/"*.!(dll)
-    fi
     rm -R "$DXVK_BUILD_DIR/build.$1"
   fi
 }

src/d3d10/meson.build

@@ -12,11 +12,9 @@ d3d10_main_src = [
   'd3d10_state_block.cpp',
 ]
 
-d3d10_d3d11_dep = dxvk_winelib ? lib_d3d11 : d3d11_dep
-
 d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_res,
   name_prefix         : '',
-  dependencies        : [ d3d10_d3d11_dep ],
+  dependencies        : [ d3d11_dep ],
   include_directories : dxvk_include_path,
   install             : true,
   objects             : not dxvk_msvc ? 'd3d10core'+def_spec_ext : [],