summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNedko Arnaudov <nedko@arnaudov.name>2011-04-23 04:52:27 +0300
committerNedko Arnaudov <nedko@arnaudov.name>2011-04-23 04:30:31 +0300
commitc420e6508e411800dbf80c50b2515b64c013a42f (patch)
tree4d1f2e40980394232b5804d6481d99c6ae264f83
parent6ae3d041682c37d318688764440f13cac7a64f05 (diff)
downloadjack2-c420e6508e411800dbf80c50b2515b64c013a42f.tar.gz
wscript: on macos build for x86_64 as well
-rw-r--r--common/wscript12
-rw-r--r--example-clients/wscript16
-rw-r--r--tests/wscript4
3 files changed, 16 insertions, 16 deletions
diff --git a/common/wscript b/common/wscript
index 2515046b..194ed8c3 100644
--- a/common/wscript
+++ b/common/wscript
@@ -30,8 +30,8 @@ def create_jack_process_obj(bld, target, sources, uselib = None):
if bld.env['IS_LINUX']:
process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
if bld.env['IS_MACOSX']:
- process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
- #process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+ process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
process.install_path = '${ADDON_DIR}/'
process.uselib_local = uselib.name
@@ -174,8 +174,8 @@ def build(bld):
if bld.env['IS_MACOSX']:
serverlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
- 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("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc -arch x86_64")
serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework CoreFoundation -framework vecLib -single_module")
serverlib.env.append_value("LINKFLAGS", "-compatibility_version 1 -current_version 1")
@@ -255,8 +255,8 @@ def build(bld):
if bld.env['IS_MACOSX']:
clientlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
- 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("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc -arch x86_64"
clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module")
clientlib.env.append_value("LINKFLAGS", "-compatibility_version 1 -current_version 1")
diff --git a/example-clients/wscript b/example-clients/wscript
index 9c70e27a..60f17a50 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -79,8 +79,8 @@ def build(bld):
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")
- #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+ prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
if bld.env['IS_LINUX']:
prog.uselib = 'RT'
@@ -102,8 +102,8 @@ def build(bld):
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")
- #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+ prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
if bld.env['IS_LINUX']:
prog.uselib = 'RT READLINE NCURSES'
@@ -117,8 +117,8 @@ def build(bld):
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")
- #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+ prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
prog.uselib = 'SNDFILE'
if bld.env['IS_LINUX']:
@@ -161,8 +161,8 @@ def build(bld):
lib.target = example_lib
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("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #lib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
lib.env.append_value("LINKFLAGS", "")
if bld.env['IS_SUN']:
lib.env.append_value("LINKFLAGS", "-lm")
diff --git a/tests/wscript b/tests/wscript
index c5e031fb..c52907b8 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -27,8 +27,8 @@ def build(bld):
if bld.env['IS_LINUX']:
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("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
prog.uselib_local = 'clientlib'
prog.target = test_program