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/te | |
| 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/te')
| -rw-r--r-- | Mac/Modules/te/_TEmodule.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Mac/Modules/te/_TEmodule.c b/Mac/Modules/te/_TEmodule.c index 047b872..f182688 100644 --- a/Mac/Modules/te/_TEmodule.c +++ b/Mac/Modules/te/_TEmodule.c @@ -3,6 +3,7 @@ #include "Python.h" +#ifndef __LP64__ #include "pymactoolbox.h" @@ -1267,8 +1268,10 @@ static PyObject *TE_as_TE(PyObject *_self, PyObject *_args) TEObj_New, _rv); return _res; } +#endif /* __LP64__ */ static PyMethodDef TE_methods[] = { +#ifndef __LP64__ {"TEScrapHandle", (PyCFunction)TE_TEScrapHandle, 1, PyDoc_STR("() -> (Handle _rv)")}, {"TEGetScrapLength", (PyCFunction)TE_TEGetScrapLength, 1, @@ -1295,6 +1298,7 @@ static PyMethodDef TE_methods[] = { PyDoc_STR("(UInt8 value) -> None")}, {"as_TE", (PyCFunction)TE_as_TE, 1, PyDoc_STR("(Handle h) -> (TEHandle _rv)")}, +#endif /* __LP64__ */ {NULL, NULL, 0} }; @@ -1304,6 +1308,7 @@ static PyMethodDef TE_methods[] = { void init_TE(void) { PyObject *m; +#ifndef __LP64__ PyObject *d; @@ -1311,8 +1316,10 @@ void init_TE(void) PyMac_INIT_TOOLBOX_OBJECT_NEW(TEHandle, TEObj_New); PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TEHandle, TEObj_Convert); +#endif /* __LP64__ */ m = Py_InitModule("_TE", TE_methods); +#ifndef __LP64__ d = PyModule_GetDict(m); TE_Error = PyMac_GetOSErrException(); if (TE_Error == NULL || @@ -1325,6 +1332,7 @@ void init_TE(void) /* Backward-compatible name */ Py_INCREF(&TE_Type); PyModule_AddObject(m, "TEType", (PyObject *)&TE_Type); +#endif /* __LP64__ */ } /* ========================= End module _TE ========================= */ |