From c16d5203385fdb623646f7f686adaceebd784deb Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 5 Jan 2015 19:07:24 +0100 Subject: [PATCH] prepare for 'ardour4' --- libs/ardour/filesystem_paths.cc | 4 ++-- libs/ardour/wscript | 1 + libs/fst/wscript | 1 + wscript | 1 + 4 files changed, 5 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', ] diff --git a/libs/fst/wscript b/libs/fst/wscript index c2afdd71fa..7449d5921d 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -83,5 +83,6 @@ def build(bld): 'USE_WS_PREFIX', 'VST_SCANNER_APP', 'PACKAGE="' + I18N_PACKAGE + '"', + 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', ] obj.install_path = os.path.join(bld.env['LIBDIR']) diff --git a/wscript b/wscript index 3728c37951..e722e3da5d 100644 --- a/wscript +++ b/wscript @@ -1049,6 +1049,7 @@ def build(bld): bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname) bld.env['LIBDIR'] = bld.env['DLLDIR'] bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale') + bld.env['lwrcase_dirname'] = lwrcase_dirname; autowaf.set_recursive()