projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing relink of dcpomatic2_map.
[dcpomatic.git]
/
run
/
dcpomatic_combiner
diff --git
a/run/dcpomatic_combiner
b/run/dcpomatic_combiner
index 3cf60d8315bf492ba5508e4edfcc2866bd8a1b36..12da46c1ffe4184cf454097db3305ffe4223032e 100755
(executable)
--- a/
run/dcpomatic_combiner
+++ b/
run/dcpomatic_combiner
@@
-1,7
+1,8
@@
#!/bin/bash
#!/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/c.hetherington/osx-environment/64/lib
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
if [ "$1" == "--debug" ]; then
shift
gdb --args build/src/tools/dcpomatic2_combiner $*
if [ "$1" == "--debug" ]; then
shift
gdb --args build/src/tools/dcpomatic2_combiner $*