projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert inclusion of our own openssl.
[dcpomatic.git]
/
src
/
lib
/
cross_linux.cc
diff --git
a/src/lib/cross_linux.cc
b/src/lib/cross_linux.cc
index ee49d50bc8ef8972da9f13d25b7f90680fc49396..03829eb04b0ffcd0b03f0c1ac5e1d02135061684 100644
(file)
--- a/
src/lib/cross_linux.cc
+++ b/
src/lib/cross_linux.cc
@@
-182,12
+182,8
@@
directory_containing_executable ()
boost::filesystem::path
openssl_path ()
{
boost::filesystem::path
openssl_path ()
{
- auto p = directory_containing_executable() / "dcpomatic2_openssl";
- if (boost::filesystem::is_regular_file(p)) {
- return p;
- }
-
- return "dcpomatic2_openssl";
+ /* Assume it's on the path */
+ return "openssl";
}
}