summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-12-03 17:20:41 +0100
committerCarl Hetherington <cth@carlh.net>2019-12-22 01:21:00 +0100
commit5508855a875d94a1bd559f29febc56c8bff68f47 (patch)
treeb11f782b699ccd6e8aeaf815bb8fcb26d09067e0
parent9f59082fa398ba32d911376257370f6687d8d707 (diff)
-cth -> -carl.
-rw-r--r--cscript2
-rw-r--r--libdcp-1.0.pc.in2
-rw-r--r--wscript8
3 files changed, 6 insertions, 6 deletions
diff --git a/cscript b/cscript
index 86ba655f..b84ce65e 100644
--- a/cscript
+++ b/cscript
@@ -76,7 +76,7 @@ def package(target, version):
if target.platform == 'windows':
d = 'build/libdcp-%s' % version
os.mkdir(d)
- for f in ['asdcp-cth.dll', 'cxml-0.dll', 'dcp-1.0.dll', 'kumu-cth.dll', 'libopenjp2.dll', 'dcpinfo.exe']:
+ for f in ['asdcp-carl.dll', 'cxml-0.dll', 'dcp-1.0.dll', 'kumu-carl.dll', 'libopenjp2.dll', 'dcpinfo.exe']:
shutil.copyfile('%s/bin/%s' % (target.directory, f), os.path.join(d, f))
if target.bits == 32:
diff --git a/libdcp-1.0.pc.in b/libdcp-1.0.pc.in
index 3cdda02e..a5f7a9ad 100644
--- a/libdcp-1.0.pc.in
+++ b/libdcp-1.0.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
Name: libdcp
Description: DCP reading and writing library
Version: @version@
-Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-cth
+Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-carl
Libs: @libs@
Cflags: -I${includedir}
diff --git a/wscript b/wscript
index 19c5fc93..e5e416ed 100644
--- a/wscript
+++ b/wscript
@@ -54,7 +54,7 @@ def options(opt):
opt.load('compiler_cxx')
opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows')
opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
- opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-cth')
+ opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-carl')
opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests')
opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples')
@@ -133,9 +133,9 @@ def configure(conf):
elif conf.options.jpeg == 'oj1':
conf.check_cfg(package='libopenjpeg1', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
conf.env.STLIB_OPENJPEG = ['openjpeg']
- conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
+ conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
conf.env.HAVE_ASDCPLIB_CTH = 1
- conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth']
+ conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl']
conf.env.HAVE_CXML = 1
conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
conf.env.STLIB_CXML = ['cxml']
@@ -144,7 +144,7 @@ def configure(conf):
conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
elif conf.options.jpeg == 'oj1':
conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
- conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
+ conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
if conf.options.target_windows: