Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
diff -ru jack-1.9.6/common/wscript jack-1.9.6_patched/common/wscript
--- jack-1.9.6/common/wscript 2010-08-30 12:23:53.000000000 +0200
+++ jack-1.9.6_patched/common/wscript 2010-10-20 13:18:05.000000000 +0200
@@ -30,8 +30,8 @@
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 x86_64")
+ #process.env.append_value("LINKFLAGS", "-arch i386 -arch x86_64")
process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
process.install_path = '${ADDON_DIR}/'
process.uselib_local = uselib.name
@@ -167,8 +167,8 @@
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 x86_64")
+ #serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -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")
@@ -218,8 +218,8 @@
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 x86_64")
+ #clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -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 -ru jack-1.9.6/example-clients/transport.c jack-1.9.6_patched/example-clients/transport.c
--- jack-1.9.6/example-clients/transport.c 2010-08-30 12:24:11.000000000 +0200
+++ jack-1.9.6_patched/example-clients/transport.c 2010-10-20 13:18:55.000000000 +0200
@@ -300,11 +300,11 @@
/* Isolate the command word. */
i = 0;
- while (line[i] && whitespace(line[i]))
+ while (line[i] && isspace(line[i]))
i++;
word = line + i;
- while (line[i] && !whitespace(line[i]))
+ while (line[i] && !isspace(line[i]))
i++;
if (line[i])
@@ -319,7 +319,7 @@
}
/* Get argument to command, if any. */
- while (whitespace(line[i]))
+ while (isspace(line[i]))
i++;
word = line + i;
@@ -335,14 +335,14 @@
register char *s, *t;
s = string;
- while (whitespace(*s))
+ while (isspace(*s))
s++;
if (*s == '\0')
return s;
t = s + strlen (s) - 1;
- while (t > s && whitespace(*t))
+ while (t > s && isspace(*t))
t--;
*++t = '\0';
diff -ru jack-1.9.6/example-clients/wscript jack-1.9.6_patched/example-clients/wscript
--- jack-1.9.6/example-clients/wscript 2010-08-30 12:24:11.000000000 +0200
+++ jack-1.9.6_patched/example-clients/wscript 2010-10-20 13:18:05.000000000 +0200
@@ -72,8 +72,8 @@
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 x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
if bld.env['IS_LINUX']:
prog.uselib = 'RT'
@@ -90,8 +90,8 @@
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 x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
if bld.env['IS_LINUX']:
prog.uselib = 'RT READLINE NCURSES'
@@ -105,8 +105,8 @@
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 x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
prog.uselib = 'SNDFILE'
if bld.env['IS_LINUX']:
@@ -155,8 +155,8 @@
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 x86_64")
+ #lib.env.append_value("LINKFLAGS", "-arch i386 -arch x86_64")
lib.env.append_value("LINKFLAGS", "")
if bld.env['IS_SUN']:
lib.env.append_value("LINKFLAGS", "-lm")
diff -ru jack-1.9.6/tests/wscript jack-1.9.6_patched/tests/wscript
--- jack-1.9.6/tests/wscript 2010-08-30 12:24:20.000000000 +0200
+++ jack-1.9.6_patched/tests/wscript 2010-10-20 13:18:05.000000000 +0200
@@ -27,8 +27,8 @@
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 x86_64")
+ #prog.env.append_value("LINKFLAGS", "-arch i386 -arch x86_64")
prog.env.append_value("LINKFLAGS", "")
prog.uselib_local = 'clientlib'
prog.target = test_program
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment