diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-07-23 21:31:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-07-23 21:31:33 +0100 |
| commit | 64a5419b16d676d48f36b4699cfe83a91ec78549 (patch) | |
| tree | 53153a2205abbbcf5cc31c129a03da59313037fd | |
| parent | bf19399f8c009ff211d5c7b45b0941417d963c4e (diff) | |
| parent | c574db0a559fd200179c485509d15fd63c2fa51d (diff) | |
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
| -rwxr-xr-x | run/dcpomatic_player | 2 | ||||
| -rwxr-xr-x | run/dcpomatic_playlist | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/run/dcpomatic_player b/run/dcpomatic_player index 9fe712ac1..922b8ff0f 100755 --- a/run/dcpomatic_player +++ b/run/dcpomatic_player @@ -1,7 +1,7 @@ #!/bin/bash export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/carl/Environments/dcpomatic/64/lib +export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib if [ "$1" == "--debug" ]; then shift gdb --args build/src/tools/dcpomatic2_player $* diff --git a/run/dcpomatic_playlist b/run/dcpomatic_playlist index 033e72677..a5ae702cb 100755 --- a/run/dcpomatic_playlist +++ b/run/dcpomatic_playlist @@ -1,7 +1,7 @@ #!/bin/bash export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/carl/Environment/64/lib +export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib if [ "$1" == "--debug" ]; then shift gdb --args build/src/tools/dcpomatic2_playlist $* |