diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-21 12:36:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-21 12:36:17 +0000 |
| commit | e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (patch) | |
| tree | ab7de2b131c3543d170b167c8b93ea2113ac112e /platform | |
| parent | 76f601f5edbdfceec91ff6f6ce4b310e0d3a6ce9 (diff) | |
| parent | 4ec7a8070dfcda1fa327df6378eaab754f119f1b (diff) | |
Mostly-merge master.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 6 | ||||
| -rw-r--r-- | platform/windows/wscript | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index cabc47741..bf7512b93 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -55,7 +55,6 @@ universal_copy $ROOT lib/libavfilter*.dylib $WORK/$libs universal_copy $ROOT lib/libavutil*.dylib $WORK/$libs universal_copy $ROOT lib/libavcodec*.dylib $WORK/$libs universal_copy $ROOT lib/libswscale*.dylib $WORK/$libs -universal_copy $ROOT lib/libpostproc*.dylib $WORK/$libs universal_copy $ROOT lib/libswresample*.dylib $WORK/$libs universal_copy $ROOT bin/ffprobe $WORK/$macos universal_copy $ENV lib/libboost_system.dylib $WORK/$libs @@ -103,6 +102,11 @@ done cp build/platform/osx/Info.plist $WORK/$approot cp icons/dcpomatic.icns $WORK/$resources/DCP-o-matic.icns +cp icons/colour_conversions.png $WORK/$resources +cp icons/defaults.png $WORK/$resources +cp icons/kdm_email.png $WORK/$resources +cp icons/servers.png $WORK/$resources +cp icons/tms.png $WORK/$resources # i18n: .mo files for lang in de_DE es_ES fr_FR it_IT sv_SE; do diff --git a/platform/windows/wscript b/platform/windows/wscript index 2c16858c2..7efa7d0ca 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -112,7 +112,6 @@ File "%cdist_deps%/bin/avutil-52.dll" File "%cdist_deps%/bin/avdevice-55.dll" File "%cdist_deps%/bin/dcp.dll" File "%cdist_deps%/bin/libopenjpeg-1.dll" -File "%cdist_deps%/bin/postproc-52.dll" File "%cdist_deps%/bin/swresample-0.dll" File "%cdist_deps%/bin/swscale-2.dll" File "%cdist_deps%/bin/cxml.dll" |