asdcplib now suffixed with -carl not -cth.

diff --git a/cscript b/cscript
index d0910a2b361d8e4fd35f2c2f90b861b7aa531668..dc1dc261d3a701bd48c8c85a0d57c90ae7f4c963 100644 (file)
--- a/cscript
+++ b/cscript
@@ -443,7 +443,7 @@ def build(target, options):
                        'build-commands': [
                            './waf configure --prefix=/app  --libdir=/app/lib build install'
                        ],
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-cth')}]})
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-carl')}]})
        modules.append({'name': 'locked_sstream',
                        'buildsystem': 'simple',
                        'build-commands': [

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 248802d6b4d6cee7b823b8ba2bf77394ef21a9c0..ab5dd3934fd2b3f3c37b54ef14bf03f1246e05b4 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -110,8 +110,8 @@ function copy_libs {
     local dest="$1"
     copy_lib_root libcxml "$dest"
     copy_lib_root libdcp-1.0 "$dest"
-    copy_lib_root libasdcp-cth "$dest"
-    copy_lib_root libkumu-cth "$dest"
+    copy_lib_root libasdcp-carl "$dest"
+    copy_lib_root libkumu-carl "$dest"
     copy_lib_root libsub "$dest"
     copy_lib_root libopenjp2 "$dest"
     copy_lib_root libavdevice "$dest"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 865b1b4e315febee1554829a539fba74f0dd5f38..933c4078f9ab1e960de8427284a204c930298037 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -162,8 +162,8 @@ File "%static_deps%/bin/libgcrypt-20.dll"
 File "%static_deps%/bin/libpangoft2-1.0-0.dll"
 File "%static_deps%/bin/libx264-152.dll"
 
-File "%cdist_deps%/bin/asdcp-cth.dll"
-File "%cdist_deps%/bin/kumu-cth.dll"
+File "%cdist_deps%/bin/asdcp-carl.dll"
+File "%cdist_deps%/bin/kumu-carl.dll"
     """, file=f)
 
     if windows_version == 'xp':

diff --git a/wscript b/wscript
index b133d9ec66b120687b97f8788efd708ee94ac7c1..fd849caa6059f5f5e1f14271177fac66797e6bd3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -329,7 +329,7 @@ def configure(conf):
     if conf.options.static_dcp:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True)