diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
| commit | 8648a8a13b04549362f14a0738947d997ef1abc7 (patch) | |
| tree | 702652b49789b13d647c4c93df985f65361a4118 /gtk2_ardour/main.cc | |
| parent | c428ec14b923928690492cab0428f8fad45f7658 (diff) | |
| parent | ae6b0b9f1ab02ab949eaf741b98e69bdab487e92 (diff) | |
fix up wscript/build issues in exportvis after merge with master
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index ceb6ceb312..d01bca2a62 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -153,7 +153,7 @@ fixup_bundle_environment (int, char* []) vector<string> lpath; lpath.push_back (bundle_dir); - lpath.push_back ("share"); + lpath.push_back ("Resources"); lpath.push_back ("locale"); localedir = strdup (Glib::build_filename (lpath).c_str()); } @@ -172,9 +172,9 @@ fixup_bundle_environment (int, char* []) export_search_path (bundle_dir, "ARDOUR_INSTANT_XML_PATH", "/Resources"); export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins"); export_search_path (bundle_dir, "VAMP_PATH", "/lib"); - export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib"); export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines"); + setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1); setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1); /* unset GTK_RC_FILES so that we only load the RC files that we define @@ -282,9 +282,9 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) export_search_path (dir_path, "ARDOUR_DATA_PATH", "/share"); export_search_path (dir_path, "LADSPA_PATH", "/plugins"); export_search_path (dir_path, "VAMP_PATH", "/lib"); - export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib"); export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines"); + setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1); setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1); /* unset GTK_RC_FILES so that we only load the RC files that we define |