Signed-off-by: falkTX <falktx@falktx.com>tags/v1.9.15
@@ -388,12 +388,12 @@ def build(bld): | |||||
if bld.env['BUILD_ADAPTER'] and bld.env['IS_LINUX'] and bld.env['BUILD_DRIVER_ALSA']: | if bld.env['BUILD_ADAPTER'] and bld.env['IS_LINUX'] and bld.env['BUILD_DRIVER_ALSA']: | ||||
audio_adapter_sources += ['../linux/alsa/JackAlsaAdapter.cpp'] | audio_adapter_sources += ['../linux/alsa/JackAlsaAdapter.cpp'] | ||||
process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | ||||
process.use = ['ALSA', 'SAMPLERATE'] | |||||
process.use += ['ALSA', 'SAMPLERATE'] | |||||
if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']: | if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']: | ||||
audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c'] | audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c'] | ||||
process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) | ||||
process.use = 'SAMPLERATE' | |||||
process.use += 'SAMPLERATE' | |||||
if bld.env['BUILD_ADAPTER'] and bld.env['IS_WINDOWS']: | if bld.env['BUILD_ADAPTER'] and bld.env['IS_WINDOWS']: | ||||
audio_adapter_sources += ['../windows/portaudio/JackPortAudioAdapter.cpp', '../windows/portaudio/JackPortAudioDevices.cpp'] | audio_adapter_sources += ['../windows/portaudio/JackPortAudioAdapter.cpp', '../windows/portaudio/JackPortAudioDevices.cpp'] | ||||
@@ -212,11 +212,13 @@ def configure(conf): | |||||
conf.env.append_unique('CCDEFINES', '_POSIX') | conf.env.append_unique('CCDEFINES', '_POSIX') | ||||
conf.env.append_unique('CXXDEFINES', '_POSIX') | conf.env.append_unique('CXXDEFINES', '_POSIX') | ||||
conf.env.append_unique('CFLAGS', '-Wall') | |||||
conf.env.append_unique('CXXFLAGS', '-Wall') | conf.env.append_unique('CXXFLAGS', '-Wall') | ||||
conf.env.append_unique('CXXFLAGS', '-std=gnu++11') | conf.env.append_unique('CXXFLAGS', '-std=gnu++11') | ||||
conf.env.append_unique('CFLAGS', '-Wall') | |||||
if conf.env['IS_MACOSX']: | |||||
if not conf.env['IS_MACOSX']: | |||||
conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined') | |||||
else: | |||||
conf.check(lib='aften', uselib='AFTEN', define_name='AFTEN') | conf.check(lib='aften', uselib='AFTEN', define_name='AFTEN') | ||||
conf.check_cxx( | conf.check_cxx( | ||||
fragment='' | fragment='' | ||||
@@ -524,14 +526,10 @@ def build_jackd(bld): | |||||
# FIXME: Is SERVER_SIDE needed? | # FIXME: Is SERVER_SIDE needed? | ||||
def create_driver_obj(bld, **kw): | def create_driver_obj(bld, **kw): | ||||
if bld.env['IS_MACOSX'] or bld.env['IS_WINDOWS']: | |||||
# On MacOSX this is necessary. | |||||
# I do not know if this is necessary on Windows. | |||||
# Note added on 2015-12-13 by karllinden. | |||||
if 'use' in kw: | |||||
kw['use'] += ['serverlib'] | |||||
else: | |||||
kw['use'] = ['serverlib'] | |||||
if 'use' in kw: | |||||
kw['use'] += ['serverlib'] | |||||
else: | |||||
kw['use'] = ['serverlib'] | |||||
driver = bld( | driver = bld( | ||||
features = ['c', 'cxx', 'cshlib', 'cxxshlib'], | features = ['c', 'cxx', 'cshlib', 'cxxshlib'], | ||||