Commit 2ff0ab39 authored by sletz's avatar sletz
Browse files

DBUS working on OSX

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2537 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 3f0c8752
......@@ -134,7 +134,8 @@ def build(bld):
serverlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
if bld.env()['IS_MACOSX']:
serverlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc")
#serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc")
serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module")
clientlib = bld.create_obj('cpp', 'shlib')
clientlib.features.append('cc')
......@@ -168,7 +169,8 @@ def build(bld):
clientlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
if bld.env()['IS_MACOSX']:
clientlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc")
#clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc")
clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module")
netmanagerlib = bld.create_obj('cpp', 'shlib')
netmanagerlib.env['shlib_PATTERN'] = '%s.so'
......@@ -179,7 +181,8 @@ def build(bld):
netmanagerlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
if bld.env()['IS_MACOSX']:
netmanagerlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
netmanagerlib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
#netmanagerlib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
netmanagerlib.env.append_value("LINKFLAGS", "")
netmanagerlib.inst_var = bld.env()['ADDON_DIR']
netmanagerlib.inst_dir = '/'
if bld.env()['IS_MACOSX']: # is this really macosx sepcific?
......
......@@ -62,7 +62,8 @@ def build(bld):
prog.source = example_program_source
if bld.env()['IS_MACOSX']:
prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "")
if bld.env()['IS_LINUX']:
prog.uselib = 'RT'
prog.uselib_local = 'clientlib'
......@@ -75,7 +76,8 @@ def build(bld):
prog.source = 'transport.c'
if bld.env()['IS_MACOSX']:
prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "")
if bld.env()['IS_LINUX']:
prog.uselib = 'RT READLINE NCURSES'
if bld.env()['IS_MACOSX']:
......@@ -89,7 +91,8 @@ def build(bld):
prog.source = 'capture_client.c'
if bld.env()['IS_MACOSX']:
prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "")
if bld.env()['IS_LINUX']:
prog.uselib = 'RT SNDFILE'
if bld.env()['IS_MACOSX']:
......@@ -105,7 +108,8 @@ def build(bld):
lib.source = example_lib_source
if bld.env()['IS_MACOSX']:
lib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
lib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
#lib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
lib.env.append_value("LINKFLAGS", "")
lib.uselib_local = 'clientlib'
lib.inst_var = bld.env()['ADDON_DIR']
lib.inst_dir = '/'
......
......@@ -48,6 +48,14 @@ char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_
# define REGFORMAT "%x"
#endif
#ifdef __APPLE__
// TODO : does not compile yet on OSX
static void signal_segv(int signum, siginfo_t* info, void*ptr)
{}
#else
static void signal_segv(int signum, siginfo_t* info, void*ptr) {
static const char *si_codes[3] = {"", "SEGV_MAPERR", "SEGV_ACCERR"};
......@@ -146,6 +154,8 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
exit (-1);
}
#endif
int setup_sigsegv() {
struct sigaction action;
......
......@@ -80,7 +80,10 @@ def build(bld):
'xml_write_raw.c',
'sigsegv.c',
]
obj.uselib = 'PTHREAD DL RT DBUS-1 EXPAT'
if bld.env()['IS_LINUX']:
obj.uselib = 'PTHREAD DL RT DBUS-1 EXPAT'
if bld.env()['IS_MACOSX']:
obj.uselib = 'PTHREAD DL DBUS-1 EXPAT'
obj.uselib_local = 'serverlib'
obj.target = 'jackdbus'
......
......@@ -19,7 +19,8 @@ def build(bld):
prog.uselib = 'RT'
if bld.env()['IS_MACOSX']:
prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
#prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
prog.env.append_value("LINKFLAGS", "")
prog.uselib_local = 'clientlib'
prog.target = test_program
if test_program != 'jack_test':
......
......@@ -132,6 +132,8 @@ def build(bld):
bld.add_subdirs('macosx')
bld.add_subdirs('example-clients')
bld.add_subdirs('tests')
if bld.env()['BUILD_JACKDBUS'] == True:
bld.add_subdirs('linux/dbus')
if bld.env()['BUILD_DOXYGEN_DOCS'] == True:
share_dir = Params.g_build.env()['PREFIX'] + '/share/jack-audio-connection-kit'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment