diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-08 15:25:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-08 15:25:57 +0000 |
| commit | 74c6ad4e15614183acd6a6c97e43b43e8aeb2115 (patch) | |
| tree | 375107dbfc91ed63c53ca2bdf2eebd095eb7d08c | |
| parent | 8c53e14e6c243ffb42504bc41d790a4e11ecc7af (diff) | |
define ARDOUR_{MIDIMAPS,MCP}_PATH for bundles and for ./ardev and its cousins, so that we can find MIDI and Mackie support files
git-svn-id: svn://localhost/ardour2/branches/3.0@12211 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 1 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 2 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 58e6c4e0ba..d8bdeb430d 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -8,6 +8,7 @@ export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/build/gt export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie export ARDOUR_PANNER_PATH=$libs/panners/2in2out:$libs/panners/1in2out:$libs/panners/vbap export ARDOUR_DATA_PATH=$TOP/gtk2_ardour:build/gtk2_ardour:. +export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:. export ARDOUR_MCP_PATH=$TOP/mcp:. if test -d $HOME/gtk/inst ; then diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 9147941242..d7b7428b7e 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -198,6 +198,7 @@ fixup_bundle_environment (int, char* []) 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; @@ -345,6 +346,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) export_search_path (dir_path, "ARDOUR_PANNER_PATH", "/lib/panners"); export_search_path (dir_path, "ARDOUR_SURFACES_PATH", "/lib/surfaces"); export_search_path (dir_path, "ARDOUR_MIDIMAPS_PATH", "/share/midi_maps"); + export_search_path (dir_path, "ARDOUR_MCP_PATH", "/share/mcp"); export_search_path (dir_path, "ARDOUR_EXPORT_FORMATS_PATH", "/share/export"); path = dir_path; diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index b4f78f9c6a..4a4e8847d3 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -101,6 +101,7 @@ Plugins=$APPROOT/Plugins Surfaces=$APPROOT/Surfaces Panners=$APPROOT/Panners MidiMaps=$APPROOT/MidiMaps +MCP=$APPROOT/MCP ExportFormats=$APPROOT/ExportFormats Templates=$APPROOT/Templates Shared=$Resources/share @@ -306,6 +307,9 @@ done) # MIDI maps cp ../../midi_maps/*.map $MidiMaps +# Mackie support files +cp ../../mcp/*.{device,profile} $MCP + # VAMP plugins that we use cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks |