smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

prepare for 'ardour4'

Browse source
This commit is contained in:
Robin Gareus 2015-01-05 19:07:24 +01:00
parent 9380b87269
commit c16d520338
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/filesystem_paths.cc
View file

@ -167,7 +167,7 @@ ardour_dll_directory ()
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL)); std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
dll_dir_path = Glib::build_filename (dll_dir_path, "lib"); 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 #else
std::string s = Glib::getenv("ARDOUR_DLL_PATH"); std::string s = Glib::getenv("ARDOUR_DLL_PATH");
if (s.empty()) { if (s.empty()) {
@ -184,7 +184,7 @@ windows_search_path ()
{ {
std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL)); std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
dll_dir_path = Glib::build_filename (dll_dir_path, "share"); 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 #endif

1
libs/ardour/wscript
View file

@ -371,6 +371,7 @@ def build(bld):
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
'EVORAL_MIDI_XML=1', 'EVORAL_MIDI_XML=1',
] ]

1
libs/fst/wscript
View file

@ -83,5 +83,6 @@ def build(bld):
'USE_WS_PREFIX', 'USE_WS_PREFIX',
'VST_SCANNER_APP', 'VST_SCANNER_APP',
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
] ]
obj.install_path = os.path.join(bld.env['LIBDIR']) obj.install_path = os.path.join(bld.env['LIBDIR'])

1
wscript
View file

@ -1049,6 +1049,7 @@ def build(bld):
bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname) bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname)
bld.env['LIBDIR'] = bld.env['DLLDIR'] bld.env['LIBDIR'] = bld.env['DLLDIR']
bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale') bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale')
bld.env['lwrcase_dirname'] = lwrcase_dirname;
autowaf.set_recursive() autowaf.set_recursive()