Re-add option to build with openjpeg 1.5.x.

1 files changed, 7 insertions, 1 deletions

diff --git a/cscript b/cscript
index 52d7e914..5d6e837f 100644
--- a/cscript
+++ b/cscript
@@ -35,7 +35,10 @@ import os
 import shutil
 
 def dependencies(target, options):
-    return (('libcxml', 'v0.17.6'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
+    if options is not None and 'jpeg' in options and options['jpeg'] == 'oj1':
+        return (('libcxml', 'v0.17.6'), ('openjpeg', 'dff786c53a9ddbc7d83f59a0f6f23ed4472e6b70'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
+    else:
+        return (('libcxml', 'v0.17.6'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
@@ -50,6 +53,9 @@ def build(target, options):
     if target.debug:
         cmd += ' --enable-debug'
 
+    if options and 'jpeg' in options and options['jpeg'] == 'oj1':
+        cmd += ' --jpeg=oj1'
+
     target.command(cmd)
     target.command('./waf build install')