projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ccdc6fc
)
Add config/data filesystem paths to search on windows
author
Paul Davis
<paul@linuxaudiosystems.com>
Sat, 13 Jul 2013 20:56:12 +0000
(16:56 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Sat, 13 Jul 2013 20:56:12 +0000
(16:56 -0400)
libs/ardour/filesystem_paths.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/filesystem_paths.cc
b/libs/ardour/filesystem_paths.cc
index 73bfaff137f726c0b9854d9516d552ebf8d7e958..4c7e996e462830efab0289a1ee69a08316817b65 100644
(file)
--- a/
libs/ardour/filesystem_paths.cc
+++ b/
libs/ardour/filesystem_paths.cc
@@
-86,14
+86,30
@@
user_config_directory ()
std::string
ardour_dll_directory ()
{
std::string
ardour_dll_directory ()
{
+#ifdef WIN32
+ 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()) {
std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
::exit (1);
}
return s;
std::string s = Glib::getenv("ARDOUR_DLL_PATH");
if (s.empty()) {
std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
::exit (1);
}
return s;
+#endif
}
}
+#ifdef WIN32
+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
ardour_config_search_path ()
{
SearchPath
ardour_config_search_path ()
{
@@
-101,7
+117,9
@@
ardour_config_search_path ()
if (search_path.empty()) {
search_path += user_config_directory();
if (search_path.empty()) {
search_path += user_config_directory();
-
+#ifdef WIN32
+ 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");
std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
if (s.empty()) {
std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
@@
-109,6
+127,7
@@
ardour_config_search_path ()
}
search_path += SearchPath (s);
}
search_path += SearchPath (s);
+#endif
}
return search_path;
}
return search_path;
@@
-121,7
+140,9
@@
ardour_data_search_path ()
if (search_path.empty()) {
search_path += user_config_directory();
if (search_path.empty()) {
search_path += user_config_directory();
-
+#ifdef WIN32
+ 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");
std::string s = Glib::getenv("ARDOUR_DATA_PATH");
if (s.empty()) {
std::cerr << _("ARDOUR_DATA_PATH not set in environment - exiting\n");
@@
-129,6
+150,7
@@
ardour_data_search_path ()
}
search_path += SearchPath (s);
}
search_path += SearchPath (s);
+#endif
}
return search_path;
}
return search_path;