From: Carl Hetherington <cth@carlh.net>
Date: Sun, 6 Dec 2015 00:28:38 +0000 (+0000)
Subject: Fix openjpeg install names.
X-Git-Tag: v2.6.4~7
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=cd352a12cfe497e52f94249aaec3eada2896d5a5

Fix openjpeg install names.
---

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 4ce7bea10..f2aecaa9a 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -96,7 +96,7 @@ universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libsub "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libsub-1.0 "$WORK/$libs"
-universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
+universal_copy_lib $ROOT libopenjp2 "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
 universal_copy_lib $ROOT libavfilter "$WORK/$libs"
diff --git a/platform/windows/wscript b/platform/windows/wscript
index cb0a64265..b056c9ef6 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -134,7 +134,7 @@ File "%cdist_deps%/bin/avdevice-56.dll"
 File "%cdist_deps%/bin/postproc-53.dll"
 File "%cdist_deps%/bin/swresample-1.dll"
 File "%cdist_deps%/bin/dcp-1.0.dll"
-File "%cdist_deps%/bin/libopenjpeg-1.dll"
+File "%cdist_deps%/bin/libopenjp2.dll"
 File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"