diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-22 23:21:28 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-22 23:21:28 +0000 |
| commit | 90b84151b9817b33381187f678cb2fdd062ed785 (patch) | |
| tree | 85ef3c44b486dcc8e388f2cad65a8269cf9a860c /platform | |
| parent | ef4cd174472dc1c4694d4451dc60b9292c60666b (diff) | |
| parent | ad0ddd25c94730bed174756a21c83a348c45687e (diff) | |
Merge branch '1.0' into 1.0-vob
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 3 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5554249f2..ccff4d567 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -84,6 +84,7 @@ universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs universal_copy $ENV lib/libzip*.dylib $WORK/$libs universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs universal_copy $ENV lib/libcurl*.dylib $WORK/$libs +universal_copy $ENV lib/libffi*.dylib $WORK/$libs for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl)"` diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 4e1f7e94f..9b719f825 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -53,6 +53,9 @@ File "%static_deps%/bin/libjpeg-8.dll" File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll" +File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index cc83f38ee..c53c2cacc 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -63,6 +63,9 @@ File "%static_deps%/bin/libjpeg-8.dll" File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll" +File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" |