summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-19 17:09:24 +0200
committerwm4 <wm4@nowhere>2014-04-19 17:10:56 +0200
commit0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87 (patch)
tree04d756999fb23a8fc83b161c950facce1fc30f8d /wscript
parent061c7eba9770ca5f29dd3c0e5b64a276feca30cc (diff)
downloadmpv-0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87.tar.bz2
mpv-0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87.tar.xz
Remove CPU detection and inline asm handling
Not needed anymore. I'm not opposed to having asm, but inline asm is too much of a pain, and it was planned long ago to eventually get rid fo all inline asm uses. For the note, the inline asm use that was removed with the previous commits was almost worthless. It was confined to video filters, and most video filtering is now done with libavfilter. Some mpv filters (like vf_pullup) actually redirect to libavfilter if possible. If asm is added in the future, it should happen in the form of external files.
Diffstat (limited to 'wscript')
-rw-r--r--wscript8
1 files changed, 2 insertions, 6 deletions
diff --git a/wscript b/wscript
index fc761030ab..4528cd3481 100644
--- a/wscript
+++ b/wscript
@@ -69,8 +69,9 @@ build_options = [
'deps_any': [ 'os-win32', 'os-cygwin'],
'func': check_ctx_vars('WINDRES')
}, {
+ # does nothing - left for backward and forward compatibility
'name': '--asm',
- 'desc': 'inline assembly',
+ 'desc': 'inline assembly (currently without effect)',
'default': 'enable',
'func': check_true,
}
@@ -85,10 +86,6 @@ main_dependencies = [
'name': 'noexecstack',
'desc': 'linker support for --nxcompat --no-seh --dynamicbase',
'func': check_cc(linkflags=['-Wl,--nxcompat', '-Wl,--no-seh', '-Wl,--dynamicbase'])
- }, {
- 'name': 'ebx-available',
- 'desc': 'ebx availability',
- 'func': check_cc(fragment=load_fragment('ebx.c'))
} , {
'name': 'libm',
'desc': '-lm',
@@ -798,7 +795,6 @@ def configure(ctx):
ctx.load('waf_customizations')
ctx.load('dependencies')
ctx.load('detections.compiler')
- ctx.load('detections.cpu')
ctx.load('detections.devices')
if ctx.env.DEST_OS in ('freebsd', 'openbsd'):