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/menu | |
| 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/menu')
| -rw-r--r-- | Mac/Modules/menu/_Menumodule.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c index e6a7f2f..66ebf79 100644 --- a/Mac/Modules/menu/_Menumodule.c +++ b/Mac/Modules/menu/_Menumodule.c @@ -3,6 +3,7 @@ #include "Python.h" +#ifndef __LP64__ #include "pymactoolbox.h" @@ -3347,8 +3348,10 @@ static PyObject *Menu_RemoveMenuCommandProperty(PyObject *_self, PyObject *_args _res = Py_None; return _res; } +#endif /* __LP64__ */ static PyMethodDef Menu_methods[] = { +#ifndef __LP64__ {"NewMenu", (PyCFunction)Menu_NewMenu, 1, PyDoc_STR("(MenuID menuID, Str255 menuTitle) -> (MenuHandle _rv)")}, {"MacGetMenu", (PyCFunction)Menu_MacGetMenu, 1, @@ -3433,6 +3436,7 @@ static PyMethodDef Menu_methods[] = { PyDoc_STR("(MenuHandle inMenu, MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> (ByteCount outSize)")}, {"RemoveMenuCommandProperty", (PyCFunction)Menu_RemoveMenuCommandProperty, 1, PyDoc_STR("(MenuHandle inMenu, MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None")}, +#endif /* __LP64__ */ {NULL, NULL, 0} }; @@ -3442,15 +3446,18 @@ static PyMethodDef Menu_methods[] = { void init_Menu(void) { PyObject *m; +#ifndef __LP64__ PyObject *d; PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuHandle, MenuObj_New); PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuHandle, MenuObj_Convert); +#endif /* __LP64__ */ m = Py_InitModule("_Menu", Menu_methods); +#ifndef __LP64__ d = PyModule_GetDict(m); Menu_Error = PyMac_GetOSErrException(); if (Menu_Error == NULL || @@ -3463,6 +3470,7 @@ void init_Menu(void) /* Backward-compatible name */ Py_INCREF(&Menu_Type); PyModule_AddObject(m, "MenuType", (PyObject *)&Menu_Type); +#endif /* __LP64__ */ } /* ======================== End module _Menu ======================== */ |