diff options
| author | Robin Gareus <robin@gareus.org> | 2015-01-05 19:07:24 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-01-05 19:07:24 +0100 |
| commit | c16d5203385fdb623646f7f686adaceebd784deb (patch) | |
| tree | 7482e65be09280ecdf588c76db3771c4ceda6d62 /libs/ardour | |
| parent | 9380b872698305aa3b28224dfa16cb0132e2afd1 (diff) | |
prepare for 'ardour4'
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/filesystem_paths.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/wscript | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index ded481c54d..c0766c066f 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -167,7 +167,7 @@ ardour_dll_directory () #ifdef PLATFORM_WINDOWS std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL)); dll_dir_path = Glib::build_filename (dll_dir_path, "lib"); - return Glib::build_filename (dll_dir_path, "ardour3"); + return Glib::build_filename (dll_dir_path, LIBARDOUR); #else std::string s = Glib::getenv("ARDOUR_DLL_PATH"); if (s.empty()) { @@ -184,7 +184,7 @@ windows_search_path () { std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL)); dll_dir_path = Glib::build_filename (dll_dir_path, "share"); - return Glib::build_filename (dll_dir_path, "ardour3"); + return Glib::build_filename (dll_dir_path, LIBARDOUR); } #endif diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 748c412312..c61da5149b 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -371,6 +371,7 @@ def build(bld): 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', + 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', 'EVORAL_MIDI_XML=1', ] |