diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-07 10:02:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-07 10:02:27 +0100 |
| commit | ba6e0d51a237d4f0bfa52c592d48329191329f00 (patch) | |
| tree | 73e10e65175e1c5b0ee1a3543b249a0e0452ec90 | |
| parent | c7488f10cbde39bffb8ece2601005c515acbf3a3 (diff) | |
| parent | 26251e892bfb51c774c93290bd2d81c1239453bc (diff) | |
Fix merge.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -14,9 +14,9 @@ def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' - else if target.platform == 'osx': + elif target.platform == 'osx': cmd += ' --osx' - else if target.platform == 'linux': + elif target.platform == 'linux': cmd += ' --static' env.command(cmd) diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index c52d1e9eb..f757eda34 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -70,7 +70,7 @@ for obj in $WORK/$macos/dvdomatic $WORK/$libs/*.dylib; do fi done - +pwd cp build/platform/osx/Info.plist $WORK/$approot cp icons/dvdomatic.icns $WORK/$resources/DVD-o-matic.icns |