diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
| commit | cc27c2716f755305d67f1e1ba828ecf37f8405dd (patch) | |
| tree | 224d2b1c469bc671e6b826e8a535f61f6459bc81 /platform | |
| parent | 4ddf91dda7d84f169e4b905fd41cf747f4a0102c (diff) | |
| parent | 491daf8790f35611052d8954d5d74df275dcda18 (diff) | |
Merge master.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5500c4267..1174f966a 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -53,6 +53,7 @@ function universal_copy_lib { relink="$relink|$2" } +<<<<<<< HEAD universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$WORK/$macos" universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$WORK/$macos" universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$WORK/$macos" @@ -63,6 +64,18 @@ universal_copy_lib $ROOT libcxml "$WORK/$libs" universal_copy_lib $ROOT libdcp-1.0 "$WORK/$libs" universal_copy_lib $ROOT libasdcp-libdcp-1.0 "$WORK/$libs" universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs" +======= +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic "$WORK/$macos" +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli "$WORK/$macos" +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli "$WORK/$macos" +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_batch "$WORK/$macos" +universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic.dylib "$WORK/$libs" +universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic-wx.dylib "$WORK/$libs" +universal_copy_lib $ROOT libcxml "$WORK/$libs" +universal_copy_lib $ROOT libdcp "$WORK/$libs" +universal_copy_lib $ROOT libasdcp-libdcp "$WORK/$libs" +universal_copy_lib $ROOT libkumu-libdcp "$WORK/$libs" +>>>>>>> origin/master universal_copy_lib $ROOT libopenjpeg "$WORK/$libs" universal_copy_lib $ROOT libavdevice "$WORK/$libs" universal_copy_lib $ROOT libavformat "$WORK/$libs" |