diff options
| author | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2008-09-05 13:36:28 +0000 |
|---|---|---|
| committer | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2008-09-05 13:36:28 +0000 |
| commit | 3e01068967e8bff63f27e36ea76eacbcd17bfb38 (patch) | |
| tree | b5901e8b3babed0eb508d4cab5b9a0c85ac7343f /example-clients | |
| parent | 92fec924268d2e0940fa386b74b608ae25074d55 (diff) | |
| download | jack2-3e01068967e8bff63f27e36ea76eacbcd17bfb38.tar.gz | |
Merge Michael Voigt drops branch after reorganization step.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2880 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'example-clients')
| -rw-r--r-- | example-clients/wscript | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/example-clients/wscript b/example-clients/wscript index 5aa8574a..b92d26dc 100644 --- a/example-clients/wscript +++ b/example-clients/wscript @@ -56,10 +56,14 @@ def configure(conf): conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE') def build(bld): + if bld.env()['IS_LINUX']: + os_incdir = ['../linux', '../posix'] + if bld.env()['IS_MACOSX']: + os_incdir = ['../macosx', '../posix'] for example_program, example_program_source in example_programs.items(): prog = bld.create_obj('cpp', 'program') prog.features.append('cc') - prog.includes = ['../common/jack', '../common'] + prog.includes = os_incdir + ['../common/jack', '../common'] prog.source = example_program_source if bld.env()['IS_MACOSX']: prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc") @@ -76,7 +80,7 @@ def build(bld): #if bld.env()['BUILD_EXAMPLE_CLIENT_TRANSPORT'] if bld.env()['BUILD_EXAMPLE_CLIENT_TRANSPORT'] == True and bld.env()['IS_LINUX'] == True: prog = bld.create_obj('cc', 'program') - prog.includes = ['../common/jack', '../common'] + prog.includes = os_incdir + ['../common/jack', '../common'] prog.source = 'transport.c' if bld.env()['IS_MACOSX']: prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc") @@ -91,7 +95,7 @@ def build(bld): if bld.env()['BUILD_EXAMPLE_CLIENT_REC'] == True: prog = bld.create_obj('cc', 'program') - prog.includes = ['../common/jack', '../common'] + prog.includes = os_incdir + ['../common/jack', '../common'] prog.source = 'capture_client.c' if bld.env()['IS_MACOSX']: prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc") @@ -107,7 +111,7 @@ def build(bld): for example_lib, example_lib_source in example_libs.items(): lib = bld.create_obj('cc', 'shlib') lib.env['shlib_PATTERN'] = '%s.so' - lib.includes = ['../common/jack', '../common'] + lib.includes = os_incdir + ['../common/jack', '../common'] lib.target = example_lib lib.source = example_lib_source if bld.env()['IS_MACOSX']: |