diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-31 22:08:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-31 22:08:34 +0100 |
| commit | fcb3a300f1e9dbded379a7d6370954e7e6b40fda (patch) | |
| tree | 4d03c68460d00bf323a79ef2b05026a182e5ac29 | |
| parent | c8be8124ce89aee17df080745c9651d6e3975a4c (diff) | |
| parent | 83b8daa1b02809e7bd0c0310edd2c6d475181034 (diff) | |
Merge.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 6 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -27,7 +27,7 @@ def build(env, target): def package(env, target, version): if target.platform == 'windows': shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) - env.command('sed -i "s~%%resources%%~%s/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) env.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) env.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) env.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index b73e4f345..81de3a25c 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -11,7 +11,7 @@ outFile "DVD-o-matic @version@ 32-bit Installer.exe" InstallDir "$PROGRAMFILES\DVD-o-matic" !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../COPYING" +!insertmacro MUI_PAGE_LICENSE "../../../COPYING" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -28,9 +28,9 @@ Section "install" "Installation info" SetOutPath "$INSTDIR\bin" File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-54.dll" +File "%deps%/bin/avcodec-55.dll" File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-54.dll" +File "%deps%/bin/avformat-55.dll" File "%deps%/bin/avutil-52.dll" File "%deps%/bin/dcp.dll" File "%deps%/bin/libintl-8.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index f499c46c2..f2d79704b 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -13,7 +13,7 @@ outFile "DVD-o-matic @version@ 64-bit Installer.exe" InstallDir "$PROGRAMFILES\DVD-o-matic" !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../COPYING" +!insertmacro MUI_PAGE_LICENSE "../../../COPYING" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -38,9 +38,9 @@ ${EndIf} SetOutPath "$INSTDIR\bin" File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-54.dll" +File "%deps%/bin/avcodec-55.dll" File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-54.dll" +File "%deps%/bin/avformat-55.dll" File "%deps%/bin/avutil-52.dll" File "%deps%/bin/dcp.dll" File "%deps%/bin/libintl-8.dll" |