diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-12 21:30:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-12 21:30:18 +0100 |
| commit | 04acfa42cdffd5938358847ebee822399ef978e6 (patch) | |
| tree | 2159fd6e9ddddd1cd5a6c010d4dee3a4d99a17f8 | |
| parent | cc27c2716f755305d67f1e1ba828ecf37f8405dd (diff) | |
Fix merge.
| -rw-r--r-- | platform/osx/make_dmg.sh | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 1174f966a..5500c4267 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -53,7 +53,6 @@ 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" @@ -64,18 +63,6 @@ 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" |