Browse Source

Cleanup compilation

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2610 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
ad50e678a3
2 changed files with 11 additions and 2 deletions
  1. +7
    -1
      common/JackNetIOAdapter.cpp
  2. +4
    -1
      common/wscript

+ 7
- 1
common/JackNetIOAdapter.cpp View File

@@ -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)
{


+ 4
- 1
common/wscript View File

@@ -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")


Loading…
Cancel
Save