From 66f66acc99d6de49a038735a2d3236c7a8ceedd3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 29 Sep 2020 22:15:56 +0200 Subject: [PATCH] Remove some Linux hacks that I can't see the point of any more. --- run/dcpomatic | 1 - src/lib/cross_linux.cc | 5 ----- 2 files changed, 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"; } -- 2.30.2