mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-09 16:24:57 +01:00
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
30daaebaa2
commit
bc89fe0147
252 changed files with 28174 additions and 14382 deletions
|
|
@ -151,6 +151,10 @@ fixup_bundle_environment ()
|
|||
setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1);
|
||||
setenv ("ARDOUR_DATA_PATH", path.c_str(), 1);
|
||||
|
||||
path = dir_path;
|
||||
path += "/../Resources";
|
||||
setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1);
|
||||
|
||||
cstr = getenv ("LADSPA_PATH");
|
||||
if (cstr) {
|
||||
path = cstr;
|
||||
|
|
@ -264,7 +268,6 @@ fixup_bundle_environment ()
|
|||
path += "/../Resources/gdk-pixbuf.loaders";
|
||||
|
||||
setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1);
|
||||
cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl;
|
||||
|
||||
if (getenv ("ARDOUR_WITH_JACK")) {
|
||||
// JACK driver dir
|
||||
|
|
@ -297,12 +300,9 @@ int main (int argc, char *argv[])
|
|||
{
|
||||
vector<Glib::ustring> null_file_list;
|
||||
|
||||
cerr << "here we go\n";
|
||||
|
||||
#ifdef __APPLE__
|
||||
fixup_bundle_environment ();
|
||||
#endif
|
||||
cerr << "just did it\n";
|
||||
|
||||
Glib::thread_init();
|
||||
gtk_set_locale ();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue