From 9e88813d8f4491e4bdd2fe021c9b4b48b81861e5 Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Tue, 25 Apr 2006 21:45:04 +0000 Subject: [PATCH] Fixed linking for tranzport on MacOSX. git-svn-id: svn://localhost/trunk/ardour2@479 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/surfaces/tranzport/.cvsignore | 1 + libs/surfaces/tranzport/SConscript | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/surfaces/tranzport/.cvsignore b/libs/surfaces/tranzport/.cvsignore index 1edeb79fd1..50700f873e 100644 --- a/libs/surfaces/tranzport/.cvsignore +++ b/libs/surfaces/tranzport/.cvsignore @@ -1 +1,2 @@ *.os +*.dylib diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index 2739f17614..5420cd3134 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -29,12 +29,11 @@ tranzport.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"") tranzport.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"") tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") -tranzport.Append(CPPPATH=libraries['ardour'].get ('CPPPATH', [])) -tranzport.Append(CPPPATH=libraries['sigc2'].get ('CPPPATH', [])) -tranzport.Append(CPPPATH=libraries['pbd3'].get ('CPPPATH', [])) -tranzport.Append(CPPPATH=libraries['midi++2'].get ('CPPPATH', [])) - tranzport.Merge ([ + libraries['ardour'], + libraries['sigc2'], + libraries['pbd3'], + libraries['midi++2'], libraries['xml'], libraries['usb'] ])