diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-20 14:23:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-20 14:23:49 +0000 |
| commit | 746b020d9f29cb1dd4521346f3bc24cedb184d79 (patch) | |
| tree | 160eac5a2b8d76d8fb304b7a43bbf0c1ab41c081 /gtk2_ardour/main.cc | |
| parent | 8badf7492efb696461f4649e2b4de38123f87c78 (diff) | |
more tweaks to bundles, search paths and packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@12339 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index d949b899c5..23b33c4e27 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -166,13 +166,7 @@ fixup_bundle_environment (int, char* []) } setenv ("PATH", path.c_str(), 1); - path = dir_path; - path += "/../Surfaces"; - path += ':'; - path += dir_path; - path += "/../Panners"; - - setenv ("ARDOUR_DLL_PATH", path.c_str(), 1); + export_search_path (dir_path, "ARDOUR_DLL_PATH", "/../Frameworks"); path += dir_path; path += "/../Resources"; @@ -183,31 +177,15 @@ fixup_bundle_environment (int, char* []) machine-independent shared data. */ - setenv ("ARDOUR_DATA_PATH", path.c_str(), 1); - setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1); - setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1); + export_search_path (dir_path, "ARDOUR_DATA_PATH", "/../Resources"); + export_search_path (dir_path, "ARDOUR_CONFIG_PATH", "/../Resources"); + export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/../Resources"); export_search_path (dir_path, "LADSPA_PATH", "/../Plugins"); export_search_path (dir_path, "VAMP_PATH", "/../Frameworks"); - /* in theory these do not need to be set since they would be found - using ARDOUR_DATA_PATH or ARDOUR_CONFIG_PATH suffixed by a suitable - folder/directory name. However, the way we bundle Ardour on OS X - uses Capitalized names for these folders which differs from - the hard-coded folder/directory name. In addition each of them - lives at the top level of the .app/Contents tree, rather - than within Resources or Frameworks. - */ - - export_search_path (dir_path, "ARDOUR_PANNER_PATH", "/../Panners"); - export_search_path (dir_path, "ARDOUR_SURFACES_PATH", "/../Surfaces"); - export_search_path (dir_path, "ARDOUR_MIDIMAPS_PATH", "/../MidiMaps"); - export_search_path (dir_path, "ARDOUR_MCP_PATH", "../MCP"); - export_search_path (dir_path, "ARDOUR_EXPORT_FORMATS_PATH", "/../ExportFormats"); - path = dir_path; path += "/../Frameworks/clearlooks"; - setenv ("GTK_PATH", path.c_str(), 1); /* unset GTK_RC_FILES so that we only load the RC files that we define |