diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-27 20:05:48 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-27 20:05:48 +0200 |
| commit | b5a88d757874fc7b7fecb15447c52fb40930e2ca (patch) | |
| tree | e693f53a9b79b3343cd26d6895b99ac6946120c5 | |
| parent | ba7684b62d762345c337b67be48cd18e2cdc5dc5 (diff) | |
Revert some of the Linux stuff from a few commits ago.
This fixes startup from the source tree.
| -rwxr-xr-x | run/dcpomatic | 1 | ||||
| -rw-r--r-- | src/lib/cross_linux.cc | 9 | ||||
| -rw-r--r-- | wscript | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/run/dcpomatic b/run/dcpomatic index 8ce6d060a..43703fe68 100755 --- a/run/dcpomatic +++ b/run/dcpomatic @@ -5,6 +5,7 @@ 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 5c1bb7d90..0f31c108c 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -101,6 +101,11 @@ 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"; } @@ -108,14 +113,14 @@ resources_path () boost::filesystem::path xsd_path () { - return directory_containing_executable().parent_path() / "share" / "libdcp" / "xsd"; + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd"; } boost::filesystem::path tags_path () { - return directory_containing_executable().parent_path() / "share" / "libdcp" / "tags"; + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags"; } @@ -198,6 +198,7 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.env.append_value('CXXFLAGS', '-mfpmath=sse') conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) + conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align']) conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl') |