Remove some Linux hacks that I can't see the point of any more.

diff --git a/run/dcpomatic b/run/dcpomatic
index 43703fe68d0ee49d7119a7c358c208b0e18fda63..8ce6d060a2c23bc0ee3608ed44d20aff97670f28 100755 (executable)
--- 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 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
 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 0f31c108cda69327f5c7e3a7c2d999afe14aebb7..2d43d38019c7d2697af5fb498b3894be60d7724d 100644 (file)
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -101,11 +101,6 @@ cpu_info ()
 boost::filesystem::path
 resources_path ()
 {
 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";
 }
 
        return directory_containing_executable().parent_path() / "share" / "dcpomatic2";
 }