summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-09-29 22:15:56 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-29 22:15:56 +0200
commit66f66acc99d6de49a038735a2d3236c7a8ceedd3 (patch)
tree40789f6de049880a6113e4b5dc990304e24674a2
parentf3e5bba0d86dcc43bdeb0d132c7cdf85b55941a9 (diff)
Remove some Linux hacks that I can't see the point of any more.
-rwxr-xr-xrun/dcpomatic1
-rw-r--r--src/lib/cross_linux.cc5
2 files changed, 0 insertions, 6 deletions
diff --git a/run/dcpomatic b/run/dcpomatic
index 43703fe68..8ce6d060a 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -5,7 +5,6 @@ build=$DIR/../build
export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib
export DCPOMATIC_GRAPHICS=$DIR/../graphics
-export DCPOMATIC_SHARE_PREFIX=.
binary=$build/src/tools/dcpomatic2
if [ "$1" == "--debug" ]; then
shift
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 0f31c108c..2d43d3801 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -101,11 +101,6 @@ cpu_info ()
boost::filesystem::path
resources_path ()
{
- char* prefix = getenv ("DCPOMATIC_SHARE_PREFIX");
- if (prefix) {
- return boost::filesystem::path(prefix) / "dcpomatic2";
- }
-
return directory_containing_executable().parent_path() / "share" / "dcpomatic2";
}