1 files changed, 19 insertions, 1 deletions
diff --git a/cscript b/cscript
index 36b34078..06c7559d 100644
--- a/cscript
+++ b/cscript
@@ -35,7 +35,22 @@ import os
 import shutil
 
 def dependencies(target, options):
-    return (('libcxml', 'v0.17.11'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '467a54314c7b25e28f6df4c7ea03e9f8802fa525'))
+    deps = [
+        ('libcxml', 'v0.17.11', options),
+        ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
+        ('asdcplib', 'v1.0.3')
+    ]
+
+    if target.platform == 'linux':
+        ffmpeg_options = { 'shared': False }
+    else:
+        ffmpeg_options = {}
+
+    if target.platform != 'linux' or target.distro != 'arch':
+        # Use distro-provided FFmpeg on Arch, otherwise our own
+        deps.append(('ffmpeg', '1b3378e5361c73076ce736dfa2c7b40bd6f24380', ffmpeg_options))
+
+    return deps
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
@@ -49,6 +64,9 @@ def build(target, options):
     elif target.platform == 'windows':
         cmd += f' --target-windows-{target.bits}'
 
+    if 'c++17' in options and options['c++17']:
+        cmd += ' --c++17'
+
     if target.debug:
         cmd += ' --enable-debug'