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/carbonevt | |
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/carbonevt')
-rwxr-xr-x | Mac/Modules/carbonevt/_CarbonEvtmodule.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Mac/Modules/carbonevt/_CarbonEvtmodule.c b/Mac/Modules/carbonevt/_CarbonEvtmodule.c index fd4b266..66e4e27 100755 --- a/Mac/Modules/carbonevt/_CarbonEvtmodule.c +++ b/Mac/Modules/carbonevt/_CarbonEvtmodule.c @@ -3,7 +3,7 @@ #include "Python.h" - +#ifndef __LP64__ #include "pymactoolbox.h" @@ -2141,20 +2141,28 @@ static PyMethodDef CarbonEvents_methods[] = { {NULL, NULL, 0} }; +#else /* __LP64__ */ + +static PyMethodDef CarbonEvents_methods[] = { + {NULL, NULL, 0} +}; + +#endif /* __LP64__ */ void init_CarbonEvt(void) { PyObject *m; +#ifndef __LP64__ PyObject *d; +#endif /* !__LP64__ */ + m = Py_InitModule("_CarbonEvt", CarbonEvents_methods); +#ifndef __LP64__ myEventHandlerUPP = NewEventHandlerUPP(myEventHandler); - - - m = Py_InitModule("_CarbonEvt", CarbonEvents_methods); d = PyModule_GetDict(m); CarbonEvents_Error = PyMac_GetOSErrException(); if (CarbonEvents_Error == NULL || @@ -2216,6 +2224,7 @@ void init_CarbonEvt(void) /* Backward-compatible name */ Py_INCREF(&EventHotKeyRef_Type); PyModule_AddObject(m, "EventHotKeyRefType", (PyObject *)&EventHotKeyRef_Type); +#endif /* !__LP64__ */ } /* ===================== End module _CarbonEvt ====================== */ |