allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix sndfile pkg-config name and SYSLIBS.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3748 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2008-09-17 21:48:57 +00:00
parent 2ab85f4b66
commit 12037d3234
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@@ -1071,7 +1071,11 @@ if env['SYSLIBS']:
CPPPATH='#libs/appleutility')
libraries['sndfile'] = LibraryInfo()
libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs libsndfile')
libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
libraries['taglib'] = LibraryInfo(LIBS='libtaglib',
LIBPATH='#libs/taglib',
CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib'])
coredirs = [
'templates',

2
gtk2_ardour/editor_audio_import.cc
View File

@@ -228,7 +228,7 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
message = string_compose(_("A source file %1 already exists. This operation will not update that source but import the file %2 as a new source, please confirm."), wave_name, wave_name);
}
MessageDialog dialog(message, false,Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
if (all_or_nothing) {
// disabled