From cc25b993828d463cc7034ece27d2f7ec8dfecae8 Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 2 Jul 2008 12:51:52 +0000 Subject: [PATCH] Cleanup compilation git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2611 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/wscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/wscript b/common/wscript index eb136002..b832657b 100644 --- a/common/wscript +++ b/common/wscript @@ -195,12 +195,15 @@ def build(bld): create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib) if bld.env()['IS_MACOSX']: - process = create_jack_process_obj(bld, 'netioadapter', - 'JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../macosx/JackCoreAudioIOAdapter.cpp', serverlib) + process = create_jack_process_obj(bld, 'netioadapter','JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../macosx/JackCoreAudioIOAdapter.cpp', serverlib) + + if bld.env()['IS_LINUX']: + process = create_jack_process_obj(bld, 'netioadapter','JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp', serverlib) #process = create_jack_process_obj(bld, 'netioadapter', 'JackResampler.cpp JackLibSampleRateResampler.cpp JackIOAdapter.cpp JackNetIOAdapter.cpp JackCallbackNetIOAdapter.cpp ../windows/JackPortAudioIOAdapter.cpp', serverlib) process.env.append_value("LINKFLAGS", "-lsamplerate") + if bld.env()['IS_MACOSX']: process.env.append_value("LINKFLAGS", "../macosx/libportaudio.a -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreServices")