Removed 68k support, added pyexpat, adapted for new NumPy.

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index fef2a42ea5a33debba3e17927222172cd0733e7e..30c2c7c7ce87e3ea22e4d1b7e321b83ef0a43837 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -173,6 +173,7 @@ I_CORE : (buildmwproject, "CWIE", [
 
 I_PPC_PLUGINS : (buildmwproject, "CWIE", [
        (":Mac:Build:ucnhash.prj", "ucnhash.ppc"),
+       (":Mac:Build:pyexpat.prj", "pyexpat.ppc"),
        (":Mac:Build:calldll.ppc.prj", "calldll.ppc"),
        (":Mac:Build:ctb.prj", "ctb.ppc"),
        (":Mac:Build:gdbm.prj", "gdbm.ppc"),
@@ -200,6 +201,7 @@ I_PPC_PLUGINS : (buildmwproject, "CWIE", [
        ]),
 
 I_68K_PLUGINS : (buildmwproject, "CWIE", [
+       (":Mac:Build:ucnhash.prj", "ucnhash.CFM68K"),
        (":Mac:Build:ucnhash.prj", "ucnhash.CFM68K"),
        (":Mac:Build:ctb.prj", "ctb.CFM68K"),
        (":Mac:Build:gdbm.prj", "gdbm.CFM68K"),
@@ -248,8 +250,6 @@ I_PPC_EXTENSIONS : (buildmwproject, "CWIE", [
                (":Extensions:Numerical:Mac:numpymodules.prj", "multiarraymodule"),
                (":Extensions:Numerical:Mac:numpymodules.prj", "_numpy"),
                (":Extensions:Numerical:Mac:numpymodules.prj", "umathmodule"),
-               (":Extensions:Numerical:Mac:numpymodules.prj", "fast_umathmodule"),
-               (":Extensions:Numerical:Mac:numpymodules.prj", "fftpackmodule"),
                (":Extensions:Numerical:Mac:numpymodules.prj", "lapack_litemodule"),
                (":Extensions:Numerical:Mac:numpymodules.prj", "ranlibmodule"),
        ]),

diff --git a/Mac/scripts/fullbuild.rsrc b/Mac/scripts/fullbuild.rsrc
index b060b46700e6d3ecc82adb31a4d83ef8bf2b1319..40dc1076b314342dc40fe4b638047b373106b06e 100644 (file)
Binary files a/Mac/scripts/fullbuild.rsrc and b/Mac/scripts/fullbuild.rsrc differ