}
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";
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
Libraries=$APPLIB
Etc=$APPDIR/etc
Shared=$APPDIR/share
+
Plugins=$APPLIB/plugins
Surfaces=$APPLIB/surfaces
Panners=$APPLIB/panners
+
+Modules=$Libraries/modules
+Loaders=$Libraries/loaders
+
+Templates=$Shared/templates
ExportFormats=$Shared/export
Locale=$Shared/locale
MidiMaps=$Shared/midi_maps
PatchFiles=$Shared/patchfiles
MackieControl=$Shared/mcp
-Modules=$Libraries/modules
-Loaders=$Libraries/loaders
if [ x$PRINT_SYSDEPS != x ] ; then
#
# share stuff
cp -R ../../gtk2_ardour/splash.png $Shared
-# currently no templates
-#cp ../../templates/*.template $Shared/templates/
+
+# Templates
+cp ../../templates/*.template $Templates
# go through and recursively remove any .svn dirs in the bundle
for svndir in `find $APPDIR -name .svn -type d`; do
APPROOT=$APPDIR/Contents
Frameworks=$APPROOT/Frameworks
Resources=$APPROOT/Resources
-Plugins=$APPROOT/Plugins
-Surfaces=$APPROOT/Surfaces
-Panners=$APPROOT/Panners
-MidiMaps=$APPROOT/MidiMaps
-PatchFiles=$APPROOT/PatchFiles
-MCP=$APPROOT/MCP
-ExportFormats=$APPROOT/ExportFormats
-Templates=$APPROOT/Templates
-Shared=$Resources/share
-Etc=$Resources/etc
+#
+# Since this is OS X, don't try to distinguish between etc and shared
+# (machine dependent and independent data) - just put everything
+# into Resources.
+#
+Shared=$Resources
+Etc=$Resources
Locale=$Resources/locale
+#
+# Bundled Plugins live in a top level folder
+#
+Plugins=$APPROOT/Plugins
+Surfaces=$Frameworks/surfaces
+Panners=$Frameworks/panners
+MidiMaps=$Shared/midi_maps
+ExportFormats=$Shared/export
+Templates=$Shared/templates
+PatchFiles=$Shared/patchfiles
+MCP=$Shared/mcp
if [ x$PRINT_SYSDEPS != x ] ; then
#