diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 12:56:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 12:56:47 +0100 |
| commit | 5f0f0de782100a5cb558f30c7768c8af0c19bcb7 (patch) | |
| tree | acb5c1624e6b5687f94eca0882c37afb0971018c /cscript | |
| parent | 3fc3aad8735903ced3dae65f764eb33e3f5b3f11 (diff) | |
| parent | 47e6b6725168213f2a7db24c2965cfa173f755b4 (diff) | |
Merge master.
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), - ('libdcp', 'v0.45')) + ('libdcp', 'v0.49')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() @@ -28,7 +28,7 @@ def package(env, target, version): if target.platform == 'windows': shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits) env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits)) + env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits) env.command('makensis build/windows/installer2.%s.nsi' % target.bits) |