diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-03 17:20:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 17:20:59 +0100 |
| commit | 8b7646073e89effe38ce326f45a4babe32b2d5d6 (patch) | |
| tree | 9fe694e163e763ae2987ae0816f55638c4641790 | |
| parent | 8587a7420141a37c548b66f5383296eb5631c89d (diff) | |
asdcplib now suffixed with -carl not -cth.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 4 | ||||
| -rw-r--r-- | platform/windows/wscript | 4 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -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 248802d6b..ab5dd3934 100644 --- 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 865b1b4e3..933c4078f 100644 --- 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': @@ -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) |