mirror of
https://github.com/doitsujin/dxvk.git
synced 2024-12-11 10:24:10 +01:00
[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.
This commit is contained in:
parent
dbc9f40aa1
commit
436357e280
@ -53,8 +53,6 @@ cd /your/target/directory/build.64
|
|||||||
ninja install
|
ninja install
|
||||||
```
|
```
|
||||||
|
|
||||||
A winelib build can be created by adding the `--winelib` argument.
|
|
||||||
|
|
||||||
#### Compiling manually
|
#### Compiling manually
|
||||||
```
|
```
|
||||||
# 64-bit build. For 32-bit builds, replace
|
# 64-bit build. For 32-bit builds, replace
|
||||||
|
@ -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'
|
|
||||||
|
|
@ -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'
|
|
||||||
|
|
23
meson.build
23
meson.build
@ -25,30 +25,8 @@ else
|
|||||||
dxvk_library_path = meson.source_root() + '/lib32'
|
dxvk_library_path = meson.source_root() + '/lib32'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
code = '''#ifndef __WINE__
|
|
||||||
#error 1
|
|
||||||
#endif'''
|
|
||||||
|
|
||||||
dxvk_winelib = dxvk_compiler.compiles(code, name: 'winelib check')
|
|
||||||
dxvk_extradep = [ ]
|
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'
|
|
||||||
else
|
|
||||||
if dxvk_compiler.get_id() == 'msvc'
|
if dxvk_compiler.get_id() == 'msvc'
|
||||||
wrc = find_program('rc')
|
wrc = find_program('rc')
|
||||||
else
|
else
|
||||||
@ -85,7 +63,6 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
def_spec_ext = '.def'
|
def_spec_ext = '.def'
|
||||||
endif
|
|
||||||
|
|
||||||
glsl_compiler = find_program('glslangValidator')
|
glsl_compiler = find_program('glslangValidator')
|
||||||
glsl_generator = generator(glsl_compiler,
|
glsl_generator = generator(glsl_compiler,
|
||||||
|
@ -5,7 +5,7 @@ set -e
|
|||||||
shopt -s extglob
|
shopt -s extglob
|
||||||
|
|
||||||
if [ -z "$1" ] || [ -z "$2" ]; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -23,7 +23,6 @@ shift 2
|
|||||||
|
|
||||||
opt_nopackage=0
|
opt_nopackage=0
|
||||||
opt_devbuild=0
|
opt_devbuild=0
|
||||||
opt_winelib=0
|
|
||||||
|
|
||||||
crossfile="build-win"
|
crossfile="build-win"
|
||||||
|
|
||||||
@ -36,10 +35,6 @@ while [ $# -gt 0 ]; do
|
|||||||
opt_nopackage=1
|
opt_nopackage=1
|
||||||
opt_devbuild=1
|
opt_devbuild=1
|
||||||
;;
|
;;
|
||||||
"--winelib")
|
|
||||||
opt_winelib=1
|
|
||||||
crossfile="build-wine"
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo "Unrecognized option: $1" >&2
|
echo "Unrecognized option: $1" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@ -66,10 +61,6 @@ function build_arch {
|
|||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
if [ $opt_devbuild -eq 0 ]; then
|
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"
|
rm -R "$DXVK_BUILD_DIR/build.$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -12,11 +12,9 @@ d3d10_main_src = [
|
|||||||
'd3d10_state_block.cpp',
|
'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,
|
d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_res,
|
||||||
name_prefix : '',
|
name_prefix : '',
|
||||||
dependencies : [ d3d10_d3d11_dep ],
|
dependencies : [ d3d11_dep ],
|
||||||
include_directories : dxvk_include_path,
|
include_directories : dxvk_include_path,
|
||||||
install : true,
|
install : true,
|
||||||
objects : not dxvk_msvc ? 'd3d10core'+def_spec_ext : [],
|
objects : not dxvk_msvc ? 'd3d10core'+def_spec_ext : [],
|
||||||
|
Loading…
Reference in New Issue
Block a user