From ad50e678a3eca1d3ef0e90fbca700aceebd65bf8 Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 2 Jul 2008 12:51:42 +0000 Subject: [PATCH] Cleanup compilation git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2610 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackNetIOAdapter.cpp | 8 +++++++- common/wscript | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/JackNetIOAdapter.cpp b/common/JackNetIOAdapter.cpp index 94c3b819..aa13ec45 100644 --- a/common/JackNetIOAdapter.cpp +++ b/common/JackNetIOAdapter.cpp @@ -104,9 +104,15 @@ extern "C" { #endif +#include "JackCallbackNetIOAdapter.h" + +#ifdef __APPLE__ #include "JackCoreAudioIOAdapter.h" +#endif + +#ifdef WIN32 #include "JackPortAudioIOAdapter.h" -#include "JackCallbackNetIOAdapter.h" +#endif EXPORT int jack_initialize(jack_client_t* jack_client, const char* load_init) { diff --git a/common/wscript b/common/wscript index a5857b55..eb136002 100644 --- a/common/wscript +++ b/common/wscript @@ -194,7 +194,10 @@ def build(bld): create_jack_process_obj(bld, 'netmanager', 'JackNetManager.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_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 ../windows/JackPortAudioIOAdapter.cpp', serverlib) process.env.append_value("LINKFLAGS", "-lsamplerate")