Specify full path to dcpomatic2_dist_writer and tidy a few things up.

[dcpomatic.git] / src / lib / cross_windows.cc

diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index b97e2bbd0a0656394c3519a26fdf453d3e2e3efe..8d3ddbb8fd30c1f3468bf71ffbac3186022df999 100644 (file)
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -105,16 +105,6 @@ cpu_info ()
        return info;
 }
 
-boost::filesystem::path
-shared_path ()
-{
-       wchar_t dir[512];
-       GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
-       PathRemoveFileSpec (dir);
-       boost::filesystem::path path = dir;
-       return path.parent_path();
-}
-
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
 {
@@ -189,17 +179,31 @@ mount_info ()
        return m;
 }
 
-boost::filesystem::path
-openssl_path ()
+static boost::filesystem::path
+executable_path ()
 {
        wchar_t dir[512];
-       GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
+       GetModuleFileName (GetModuleHandle(0), dir, sizeof(dir));
        PathRemoveFileSpec (dir);
+       return dir;
+}
 
-       boost::filesystem::path path = dir;
-       path /= "openssl.exe";
-       return path;
+boost::filesystem::path
+shared_path ()
+{
+       return executable_path().parent_path();
+}
 
+boost::filesystem::path
+openssl_path ()
+{
+       return executable_path() / "openssl.exe";
+}
+
+boost::filesystem::path
+dist_writer_path ()
+{
+       return executable_path() / "dcpomatic2_dist_writer.exe";
 }
 
 /* Apparently there is no way to create an ofstream using a UTF-8