diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 5 | ||||
| -rw-r--r-- | platform/windows/wscript | 62 |
2 files changed, 36 insertions, 31 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index bebd089bd..6498254e5 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -158,6 +158,7 @@ function copy_libs { copy_lib_root libleqm_nrt "$dest" copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$dest" copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$dest" + copy_lib_env libboost_atomic "$dest" copy_lib_env libboost_system "$dest" copy_lib_env libboost_filesystem "$dest" copy_lib_env libboost_thread "$dest" @@ -167,7 +168,7 @@ function copy_libs { copy_lib_env libxml++ "$dest" copy_lib_env libxslt "$dest" copy_lib_env libxml2 "$dest" - copy_lib_env libglibmm-2.4 "$dest" + copy_lib_env libglibmm "$dest" copy_lib_env libgobject "$dest" copy_lib_env libgthread "$dest" copy_lib_env libgmodule "$dest" @@ -269,7 +270,7 @@ function copy_resources { # i18n: wxWidgets .mo files for lang in de es fr it sv nl ru pl da cs sl; do mkdir "$dest/$lang" - cp $ENV/$ARCH1/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang" + cp $ENV/$ARCH1/share/locale/$lang/LC_MESSAGES/wxstd*.mo "$dest/$lang" done } diff --git a/platform/windows/wscript b/platform/windows/wscript index 17965d54c..adbd1b0ef 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -116,14 +116,14 @@ File "%static_deps%/bin/libssh.dll" File "%static_deps%/bin/libstdc++-6.dll" File "%static_deps%/bin/zlib1.dll" File "%static_deps%/bin/libjpeg-9.dll" -File "%static_deps%/bin/wxbase314u_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_core_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_adv_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_richtext_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_html_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_gl_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_propgrid_gcc_custom.dll" -File "%static_deps%/bin/wxbase314u_xml_gcc_custom.dll" +File "%static_deps%/bin/wxbase317u_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_core_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_html_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_gl_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_propgrid_gcc_custom.dll" +File "%static_deps%/bin/wxbase317u_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" @@ -131,7 +131,8 @@ File "%static_deps%/bin/libpango-1.0-0.dll" File "%static_deps%/bin/libgmodule-2.0-0.dll" File "%static_deps%/bin/libpangocairo-1.0-0.dll" File "%static_deps%/bin/libpangowin32-1.0-0.dll" -File "%static_deps%/bin/libtiff-5.dll" +File "%static_deps%/bin/libpangoft2-1.0-0.dll" +File "%static_deps%/bin/libtiff-6.dll" File "%static_deps%/bin/libglibmm-2.4-1.dll" File "%static_deps%/bin/libxml++-2.6-2.dll" File "%static_deps%/bin/libxml2-2.dll" @@ -143,7 +144,7 @@ File "%static_deps%/bin/libxmlsec1.dll" File "%static_deps%/bin/libxmlsec1-openssl.dll" File "%static_deps%/bin/libexslt-0.dll" File "%static_deps%/bin/libxslt-1.dll" -File "%static_deps%/bin/libffi-6.dll" +File "%static_deps%/bin/libffi-7.dll" File "%static_deps%/bin/openssl.exe" File "%static_deps%/bin/libcurl-4.dll" File "%static_deps%/bin/libzip.dll" @@ -166,11 +167,14 @@ File "%static_deps%/bin/libunistring-2.dll" File "%static_deps%/bin/libssh2-1.dll" File "%static_deps%/bin/libgcrypt-20.dll" File "%static_deps%/bin/libgpg-error-0.dll" -File "%static_deps%/bin/libpangoft2-1.0-0.dll" File "%static_deps%/bin/libx264-155.dll" File "%static_deps%/bin/libwebp-7.dll" File "%static_deps%/bin/GLEW.dll" File "%static_deps%/bin/libdav1d.dll" +File "%static_deps%/bin/libbrotlidec.dll" +File "%static_deps%/bin/libbrotlicommon.dll" +File "%static_deps%/bin/libfribidi-0.dll" +File "%static_deps%/bin/libsharpyuv-0.dll" """, file=f) if bits == 32: @@ -196,14 +200,14 @@ File "%cdist_deps%/lib/liblwext4.dll" """, file=f) print(""" -File "%cdist_deps%/bin/avcodec-58.dll" -File "%cdist_deps%/bin/avfilter-7.dll" -File "%cdist_deps%/bin/avformat-58.dll" -File "%cdist_deps%/bin/avutil-56.dll" -File "%cdist_deps%/bin/avdevice-58.dll" -File "%cdist_deps%/bin/postproc-55.dll" -File "%cdist_deps%/bin/swresample-3.dll" -File "%cdist_deps%/bin/swscale-5.dll" +File "%cdist_deps%/bin/avcodec-60.dll" +File "%cdist_deps%/bin/avfilter-9.dll" +File "%cdist_deps%/bin/avformat-60.dll" +File "%cdist_deps%/bin/avutil-58.dll" +File "%cdist_deps%/bin/avdevice-60.dll" +File "%cdist_deps%/bin/postproc-57.dll" +File "%cdist_deps%/bin/swresample-4.dll" +File "%cdist_deps%/bin/swscale-7.dll" File "%cdist_deps%/bin/dcp-1.0.dll" File "%cdist_deps%/bin/cxml-0.dll" File "%cdist_deps%/bin/sub-1.0.dll" @@ -232,47 +236,47 @@ SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES" File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo" File "%binaries%/src/wx/mo/fr_FR/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/fr_FR/dcpomatic2.mo" -File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES" File "%binaries%/src/lib/mo/it_IT/libdcpomatic2.mo" File "%binaries%/src/wx/mo/it_IT/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/it_IT/dcpomatic2.mo" -File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES" File "%binaries%/src/lib/mo/es_ES/libdcpomatic2.mo" File "%binaries%/src/wx/mo/es_ES/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/es_ES/dcpomatic2.mo" -File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES" File "%binaries%/src/lib/mo/sv_SE/libdcpomatic2.mo" File "%binaries%/src/wx/mo/sv_SE/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dcpomatic2.mo" -File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES" File "%binaries%/src/lib/mo/de_DE/libdcpomatic2.mo" File "%binaries%/src/wx/mo/de_DE/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/de_DE/dcpomatic2.mo" -File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES" File "%binaries%/src/lib/mo/nl_NL/libdcpomatic2.mo" File "%binaries%/src/wx/mo/nl_NL/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/nl_NL/dcpomatic2.mo" -File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\ru\\LC_MESSAGES" File "%binaries%/src/lib/mo/ru_RU/libdcpomatic2.mo" File "%binaries%/src/wx/mo/ru_RU/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/ru_RU/dcpomatic2.mo" -File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\pl\\LC_MESSAGES" File "%binaries%/src/lib/mo/pl_PL/libdcpomatic2.mo" File "%binaries%/src/wx/mo/pl_PL/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/pl_PL/dcpomatic2.mo" -File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\da\\LC_MESSAGES" File "%binaries%/src/lib/mo/da_DK/libdcpomatic2.mo" File "%binaries%/src/wx/mo/da_DK/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/da_DK/dcpomatic2.mo" -File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\pt_PT\\LC_MESSAGES" File "%binaries%/src/lib/mo/pt_PT/libdcpomatic2.mo" File "%binaries%/src/wx/mo/pt_PT/libdcpomatic2-wx.mo" @@ -289,7 +293,7 @@ SetOutPath "$INSTDIR\\locale\\cs\\LC_MESSAGES" File "%binaries%/src/lib/mo/cs_CZ/libdcpomatic2.mo" File "%binaries%/src/wx/mo/cs_CZ/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/cs_CZ/dcpomatic2.mo" -File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\uk\\LC_MESSAGES" File "%binaries%/src/lib/mo/uk_UA/libdcpomatic2.mo" File "%binaries%/src/wx/mo/uk_UA/libdcpomatic2-wx.mo" |