diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-06-05 12:58:24 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-06-05 12:58:24 (GMT) |
| commit | 5640ce2f1edc0148ee14fd3daeb7ac700700bb71 (patch) | |
| tree | 9bc8b41710d3a86ccbb579a0209928d787386b69 /Mac/Modules/snd/_Sndmodule.c | |
| parent | 80af6da7489c3b28e0a46c73849da34273972e3b (diff) | |
| download | cpython-5640ce2f1edc0148ee14fd3daeb7ac700700bb71.zip cpython-5640ce2f1edc0148ee14fd3daeb7ac700700bb71.tar.gz cpython-5640ce2f1edc0148ee14fd3daeb7ac700700bb71.tar.bz2 | |
MacOS X: Enable 4-way universal builds
This patch adds a new configure argument on OSX:
--with-universal-archs=[32-bit|64-bit|all]
When used with the --enable-universalsdk option this controls which
CPU architectures are includes in the framework. The default is 32-bit,
meaning i386 and ppc. The most useful alternative is 'all', which includes
all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).
This includes limited support for the Carbon bindings in 64-bit mode as well,
limited because (a) I haven't done extensive testing and (b) a large portion
of the Carbon API's aren't available in 64-bit mode anyway.
I've also duplicated a feature of Apple's build of python: setting the
environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
extensions using distutils.
Diffstat (limited to 'Mac/Modules/snd/_Sndmodule.c')
| -rw-r--r-- | Mac/Modules/snd/_Sndmodule.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Mac/Modules/snd/_Sndmodule.c b/Mac/Modules/snd/_Sndmodule.c index fcaee5f..c0c739a 100644 --- a/Mac/Modules/snd/_Sndmodule.c +++ b/Mac/Modules/snd/_Sndmodule.c @@ -3,6 +3,7 @@ #include "Python.h" +#ifndef __LP64__ #include "pymactoolbox.h" @@ -981,8 +982,10 @@ static PyObject *Snd_SPBBytesToMilliseconds(PyObject *_self, PyObject *_args) byteCount); return _res; } +#endif /* __LP64__ */ static PyMethodDef Snd_methods[] = { +#ifndef __LP64__ {"SPB", (PyCFunction)Snd_SPB, 1, PyDoc_STR(NULL)}, {"SysBeep", (PyCFunction)Snd_SysBeep, 1, @@ -1047,10 +1050,12 @@ static PyMethodDef Snd_methods[] = { PyDoc_STR("(long inRefNum) -> (long milliseconds)")}, {"SPBBytesToMilliseconds", (PyCFunction)Snd_SPBBytesToMilliseconds, 1, PyDoc_STR("(long inRefNum) -> (long byteCount)")}, +#endif /* __LP64__ */ {NULL, NULL, 0} }; +#ifndef __LP64__ /* Routine passed to Py_AddPendingCall -- call the Python callback */ static int @@ -1113,19 +1118,23 @@ SPB_completion(SPBPtr my_spb) SetA5(A5); } } +#endif /* __LP64__ */ void init_Snd(void) { PyObject *m; +#ifndef __LP64__ PyObject *d; +#endif /* __LP64__ */ m = Py_InitModule("_Snd", Snd_methods); +#ifndef __LP64__ d = PyModule_GetDict(m); Snd_Error = PyMac_GetOSErrException(); if (Snd_Error == NULL || @@ -1145,6 +1154,7 @@ void init_Snd(void) /* Backward-compatible name */ Py_INCREF(&SPB_Type); PyModule_AddObject(m, "SPBType", (PyObject *)&SPB_Type); +#endif /* __LP64__ */ } /* ======================== End module _Snd ========================= */ |