(target.platform == 'osx' and target.bits == 64) or
(target.platform == 'windows')) else {}
- deps.append(('libdcp', 'f3e6907', cpp_lib_options))
- deps.append(('libsub', 'f703fc2', cpp_lib_options))
+ deps.append(('libdcp', '627dfd9', cpp_lib_options))
+ deps.append(('libsub', 'efea829', cpp_lib_options))
deps.append(('leqm-nrt', 'carl'))
deps.append(('rtaudio', 'carl'))
# We get our OpenSSL libraries from the environment, but we
# e.g. --run_tests=foo
export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DCPOMATIC_LINUX_SHARE_PREFIX=`pwd`
if [ "$1" == "--debug" ]; then
shift;
gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
#endif
extern boost::filesystem::path resources_path ();
extern boost::filesystem::path xsd_path ();
+extern boost::filesystem::path tags_path ();
extern FILE * fopen_boost (boost::filesystem::path, std::string);
extern int dcpomatic_fseek (FILE *, int64_t, int);
extern void start_batch_converter ();
boost::filesystem::path
resources_path ()
{
- char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
- if (p) {
- return boost::filesystem::path(p) / "dcpomatic2";
- }
- return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "dcpomatic2";
+ return directory_containing_executable().parent_path() / "share" / "dcpomatic2";
}
boost::filesystem::path
xsd_path ()
{
- char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
- if (p) {
- return boost::filesystem::path(p) / "libdcp" / "xsd";
- }
- return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
+ return directory_containing_executable().parent_path() / "share" / "libdcp" / "xsd";
+}
+
+
+boost::filesystem::path
+tags_path ()
+{
+ return directory_containing_executable().parent_path() / "share" / "libdcp" / "tags";
}
#endif
Pango::init ();
- dcp::init ();
+ dcp::init (tags_path());
#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
/* Render something to fontconfig to create its cache */
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')