diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-03-21 21:58:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-03-21 21:58:31 +0100 |
| commit | 0e0251eefc6504274dd0c8ea700c92647fea2c80 (patch) | |
| tree | 789a308d4380b0d42794ef9829ac724b8911da29 | |
| parent | a534224c185d9cd1df2fad0fc9fb820c72bb5302 (diff) | |
fixup! FIXME: test new asdcplib via libdcp
| -rw-r--r-- | platform/osx/make_dmg.sh | 4 | ||||
| -rw-r--r-- | platform/windows/wscript | 4 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 6498254e5..f53203264 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -141,8 +141,8 @@ function copy_libs { local dest="$1" copy_lib_root libcxml "$dest" copy_lib_root libdcp-1.0 "$dest" - copy_lib_root libasdcp-carl "$dest" - copy_lib_root libkumu-carl "$dest" + copy_lib_root libasdcp-dcpomatic "$dest" + copy_lib_root libkumu-dcpomatic "$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 adbd1b0ef..b208f94dd 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -188,8 +188,8 @@ File "%static_deps%/bin/libdl.dll" File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe" File /oname=dcpomatic2_kdm_inspect.exe "%cdist_deps%/bin/dcpkdm.exe" File "%cdist_deps%/bin/leqm_nrt.dll" -File "%cdist_deps%/bin/asdcp-carl.dll" -File "%cdist_deps%/bin/kumu-carl.dll" +File "%cdist_deps%/bin/asdcp-dcpomatic.dll" +File "%cdist_deps%/bin/kumu-dcpomatic.dll" """, file=f) if disk: @@ -377,7 +377,7 @@ def configure(conf): if conf.options.static_dcp: conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags' % libdcp_version, 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-carl', 'kumu-carl', 'openjp2'] + conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-dcpomatic', 'kumu-dcpomatic', 'openjp2'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c'] else: conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags --libs' % libdcp_version, uselib_store='DCP', mandatory=True) |