diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-03 17:32:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-03 17:32:01 +0000 |
| commit | f0e95aa5b7ada81a1c40f06facab2e94e45ab26c (patch) | |
| tree | 8c96cefcbb4bd6d587629f08998f105206c7c5c3 /platform | |
| parent | c3362d7b12e425fa9549579be10e708c88d5feea (diff) | |
| parent | 30621d42f26991c84fff56a5e79dd9e19f657c7d (diff) | |
Merge branch 'master' into 1.0-seek
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 6 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 6 | ||||
| -rw-r--r-- | platform/windows/wscript | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 6201b9fd7..c6122e297 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -85,7 +85,7 @@ File "%static_deps%/bin/libzip-2.dll" File "%cdist_deps%/bin/asdcp-libdcp.dll" File "%cdist_deps%/bin/kumu-libdcp.dll" File "%cdist_deps%/bin/avcodec-55.dll" -File "%cdist_deps%/bin/avfilter-3.dll" +File "%cdist_deps%/bin/avfilter-4.dll" File "%cdist_deps%/bin/avformat-55.dll" File "%cdist_deps%/bin/avutil-52.dll" File "%cdist_deps%/bin/avdevice-55.dll" @@ -128,6 +128,10 @@ SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo" File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo" +SetOutPath "$INSTDIR\locale\de\LC_MESSAGES" +File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo" +File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo" +File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo" CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" CreateShortCut "$DESKTOP\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic_batch.exe" "" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index ba6f7b132..c6d4e96cf 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -95,7 +95,7 @@ File "%static_deps%/bin/libzip-2.dll" File "%cdist_deps%/bin/asdcp-libdcp.dll" File "%cdist_deps%/bin/kumu-libdcp.dll" File "%cdist_deps%/bin/avcodec-55.dll" -File "%cdist_deps%/bin/avfilter-3.dll" +File "%cdist_deps%/bin/avfilter-4.dll" File "%cdist_deps%/bin/avformat-55.dll" File "%cdist_deps%/bin/avutil-52.dll" File "%cdist_deps%/bin/avdevice-55.dll" @@ -138,6 +138,10 @@ SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo" File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo" +SetOutPath "$INSTDIR\locale\de\LC_MESSAGES" +File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo" +File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo" +File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo" CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" CreateShortCut "$DESKTOP\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic_batch.exe" "" diff --git a/platform/windows/wscript b/platform/windows/wscript index 585cebef1..088539259 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,4 +1,4 @@ def build(bld): - bld.new_task_gen(features = 'subst', source = 'installer.nsi.32.in', target = 'installer.32.nsi', version = bld.env.VERSION) - bld.new_task_gen(features = 'subst', source = 'installer.nsi.64.in', target = 'installer.64.nsi', version = bld.env.VERSION) + bld.new_task_gen(features='subst', source='installer.nsi.32.in', target='installer.32.nsi', version=bld.env.VERSION) + bld.new_task_gen(features='subst', source='installer.nsi.64.in', target='installer.64.nsi', version=bld.env.VERSION) |