Merge branch 'master' into windows

[ardour.git] / libs / ardour / filesystem_paths.cc

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index bea0e330b9090ece99f0ce037e4e3b1bb63ab9cc..54f7508b659d92ce55b34410dcbbd1fb35b26f1b 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -86,52 +86,71 @@ user_config_directory ()
 std::string
 ardour_dll_directory ()
 {
-       static std::string s;
-
+#ifdef PLATFORM_WINDOWS
+       std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
+       dll_dir_path = Glib::build_filename (dll_dir_path, "lib");
+       return Glib::build_filename (dll_dir_path, "ardour3");
+#else
+       std::string s = Glib::getenv("ARDOUR_DLL_PATH");
        if (s.empty()) {
-                       s = Glib::getenv("ARDOUR_DLL_PATH");
-                       std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
-                       ::exit (1);
-               }
-
+               std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
+               ::exit (1);
+       }       
        return s;
+#endif
+}
+
+#ifdef PLATFORM_WINDOWS
+Searchpath
+windows_search_path ()
+{
+       std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
+       dll_dir_path = Glib::build_filename (dll_dir_path, "share");
+       return Glib::build_filename (dll_dir_path, "ardour3");
 }
+#endif
 
-SearchPath
+Searchpath
 ardour_config_search_path ()
 {
-       static SearchPath search_path;
+       static Searchpath search_path;
 
        if (search_path.empty()) {
                search_path += user_config_directory();
-               
+#ifdef PLATFORM_WINDOWS
+               search_path += windows_search_path ();
+#else
                std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
                if (s.empty()) {
                        std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
                        ::exit (1);
                }
                
-               search_path += SearchPath (s);
+               search_path += Searchpath (s);
+#endif
        }
 
        return search_path;
 }
 
-SearchPath
+Searchpath
 ardour_data_search_path ()
 {
-       static SearchPath search_path;
+       static Searchpath search_path;
 
        if (search_path.empty()) {
                search_path += user_config_directory();
-               
+#ifdef PLATFORM_WINDOWS
+               search_path += windows_search_path ();
+#else
                std::string s = Glib::getenv("ARDOUR_DATA_PATH");
                if (s.empty()) {
                        std::cerr << _("ARDOUR_DATA_PATH not set in environment - exiting\n");
                        ::exit (1);
                }
                
-               search_path += SearchPath (s);
+               search_path += Searchpath (s);
+#endif
        }
 
        return search_path;