From db4b99b5b6031fec3d20fc5b880b52d43917ecac Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 4 May 2011 09:55:27 +0000 Subject: [PATCH] Fix link issues for jackd. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4377 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackDriverLoader.h | 9 +++++++++ linux/wscript | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/JackDriverLoader.h b/common/JackDriverLoader.h index fa44f856..fafe5f57 100644 --- a/common/JackDriverLoader.h +++ b/common/JackDriverLoader.h @@ -59,9 +59,18 @@ jack_driver_desc_t * jack_find_driver_descriptor(JSList * drivers, const char * JSList * jack_drivers_load(JSList * drivers); JSList * jack_internals_load(JSList * internals); +#ifdef __cplusplus +extern "C" +{ +#endif + SERVER_EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]); SERVER_EXPORT void jack_free_driver_params(JSList * param_ptr); SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file); +#ifdef __cplusplus +} +#endif + #endif diff --git a/linux/wscript b/linux/wscript index 901a9ef0..79384737 100644 --- a/linux/wscript +++ b/linux/wscript @@ -34,7 +34,7 @@ def build(bld): if bld.env['BUILD_JACKD'] == True: jackd = bld.new_task_gen('cxx', 'program') jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus'] - jackd.defines = 'HAVE_CONFIG_H' + jackd.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] jackd.source = ['../common/Jackdmp.cpp'] if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']: jackd.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c']