Added GUSI-Carbon targets (both threading and nonthreading), and they work!! YEAH!!!

diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp
index 4866769639e1a38587eebfca21b5341f70695144..86122814d2755a1c1b00e16d1942644926d2a975 100644 (file)
Binary files a/Mac/Build/PythonStandSmall.mcp and b/Mac/Build/PythonStandSmall.mcp differ

diff --git a/Mac/mwerks/mwerks_carbonNOGUSI_config.h b/Mac/mwerks/mwerks_carbonNOGUSI_config.h
new file mode 100644 (file)
index 0000000..e886d36
--- /dev/null
+++ b/Mac/mwerks/mwerks_carbonNOGUSI_config.h
@@ -0,0 +1,46 @@
+/*
+** Configuration file for small standalone 68k/ppc Python.
+**
+** Note: enabling the switches below is not enough to enable the
+** specific features, you may also need different sets of sources.
+*/
+#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+#define OPAQUE_TOOLBOX_STRUCTS 1
+#define TARGET_API_MAC_CARBON 1
+#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
+
+#define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
+/* #define USE_GUSI2           /* Stdio implemented with GUSI 2 */
+/* # define USE_GUSI1  /* Stdio implemented with GUSI 1 */
+#define USE_MSL                        /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
+#define USE_TOOLBOX            /* Include toolbox modules in core Python */
+/* #define USE_CORE_TOOLBOX            /* Include minimal set of toolbox modules in core Python */
+#define USE_QT                 /* Include quicktime modules in core Python */
+/* #define USE_WASTE           /* Include waste module in core Python */
+/* #define USE_MACSPEECH               /* Include macspeech module in core Python */
+/* #define USE_IMG             /* Include img modules in core Python */
+/* #define USE_MACCTB          /* Include ctb module in core Python */
+/* #define USE_STDWIN          /* Include stdwin module in core Python */
+/* #define USE_MACTCP          /* Include mactcp (*not* socket) modules in core */
+/* #define USE_TK                      /* Include _tkinter module in core Python */
+/* #define MAC_TCL                     /* This *must* be on if USE_TK is on */
+/* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
+/* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
+/* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
+/* #define USE_GDBM            /* Include the gdbm module */
+/* #define USE_ZLIB            /* Include the zlib module */
+#define USE_UCNHASH            /* Include ucnhash module */
+#define USE_APPEARANCE /* Enable Appearance support */
+
+#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
+#ifndef USE_MSL_MALLOC
+/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
+#ifdef __powerc
+#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
+#endif
+#endif
+
+#ifdef USE_MSL
+#define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */
+#include <ansi_prefix.mac.h>
+#endif

diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h
index e886d3697641e8199545ec96fe0225de5a76c720..66a189fc24772e62669d80897cc1d73ee79e8230 100644 (file)
--- a/Mac/mwerks/mwerks_carbon_config.h
+++ b/Mac/mwerks/mwerks_carbon_config.h
@@ -10,7 +10,7 @@
 #define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
 
 #define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
-/* #define USE_GUSI2           /* Stdio implemented with GUSI 2 */
+#define USE_GUSI2              /* Stdio implemented with GUSI 2 */
 /* # define USE_GUSI1  /* Stdio implemented with GUSI 1 */
 #define USE_MSL                        /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
 #define USE_TOOLBOX            /* Include toolbox modules in core Python */

diff --git a/Mac/mwerks/mwerks_carbongusi_config.h b/Mac/mwerks/mwerks_carbongusi_config.h
new file mode 100644 (file)
index 0000000..e14d953
--- /dev/null
+++ b/Mac/mwerks/mwerks_carbongusi_config.h
@@ -0,0 +1,44 @@
+/*
+** Configuration file for small standalone 68k/ppc Python.
+**
+** Note: enabling the switches below is not enough to enable the
+** specific features, you may also need different sets of sources.
+*/
+#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+#define OPAQUE_TOOLBOX_STRUCTS 1
+#define TARGET_API_MAC_CARBON 1
+#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
+
+#define USE_GUSI2              /* Stdio implemented with GUSI 2 */
+/* # define USE_GUSI1  /* Stdio implemented with GUSI 1 */
+#define USE_MSL                        /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
+#define USE_TOOLBOX            /* Include toolbox modules in core Python */
+/* #define USE_CORE_TOOLBOX            /* Include minimal set of toolbox modules in core Python */
+#define USE_QT                 /* Include quicktime modules in core Python */
+/* #define USE_WASTE           /* Include waste module in core Python */
+/* #define USE_MACSPEECH               /* Include macspeech module in core Python */
+/* #define USE_IMG             /* Include img modules in core Python */
+/* #define USE_MACCTB          /* Include ctb module in core Python */
+/* #define USE_STDWIN          /* Include stdwin module in core Python */
+/* #define USE_MACTCP          /* Include mactcp (*not* socket) modules in core */
+/* #define USE_TK                      /* Include _tkinter module in core Python */
+/* #define MAC_TCL                     /* This *must* be on if USE_TK is on */
+/* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
+/* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
+/* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
+/* #define USE_GDBM            /* Include the gdbm module */
+/* #define USE_ZLIB            /* Include the zlib module */
+#define USE_APPEARANCE /* Enable Appearance support */
+
+#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
+#ifndef USE_MSL_MALLOC
+/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
+#ifdef __powerc
+#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
+#endif
+#endif
+
+#ifdef USE_MSL
+#define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */
+#include <ansi_prefix.mac.h>
+#endif

diff --git a/Mac/mwerks/mwerks_thrcarbonsm_config.h b/Mac/mwerks/mwerks_thrcarbonsm_config.h
new file mode 100644 (file)
index 0000000..3994a99
--- /dev/null
+++ b/Mac/mwerks/mwerks_thrcarbonsm_config.h
@@ -0,0 +1,47 @@
+/*
+** Configuration file for small standalone 68k/ppc Python.
+**
+** Note: enabling the switches below is not enough to enable the
+** specific features, you may also need different sets of sources.
+*/
+#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+#define OPAQUE_TOOLBOX_STRUCTS 1
+#define TARGET_API_MAC_CARBON 1
+#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
+
+#define USE_ARGV0_CHDIR                /* Workaround for OSXDP4: change dir to argv[0] dir */
+#define USE_GUSI2              /* Stdio implemented with GUSI 2 */
+/* # define USE_GUSI1  /* Stdio implemented with GUSI 1 */
+#define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */
+#define USE_MSL                        /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
+#define USE_TOOLBOX            /* Include toolbox modules in core Python */
+/* #define USE_CORE_TOOLBOX            /* Include minimal set of toolbox modules in core Python */
+#define USE_QT                 /* Include quicktime modules in core Python */
+/* #define USE_WASTE           /* Include waste module in core Python */
+/* #define USE_MACSPEECH               /* Include macspeech module in core Python */
+/* #define USE_IMG             /* Include img modules in core Python */
+/* #define USE_MACCTB          /* Include ctb module in core Python */
+/* #define USE_STDWIN          /* Include stdwin module in core Python */
+/* #define USE_MACTCP          /* Include mactcp (*not* socket) modules in core */
+/* #define USE_TK                      /* Include _tkinter module in core Python */
+/* #define MAC_TCL                     /* This *must* be on if USE_TK is on */
+/* #define USE_MAC_SHARED_LIBRARY      /* Enable code to add shared-library resources */
+/* #define USE_MAC_APPLET_SUPPORT      /* Enable code to run a PYC resource */
+/* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
+/* #define USE_GDBM            /* Include the gdbm module */
+/* #define USE_ZLIB            /* Include the zlib module */
+#define USE_UCNHASH            /* Include ucnhash module */
+#define USE_APPEARANCE /* Enable Appearance support */
+
+#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
+#ifndef USE_MSL_MALLOC
+/* #define USE_MALLOC_DEBUG                    /* Enable range checking and other malloc debugging */
+#ifdef __powerc
+#define USE_CACHE_ALIGNED 8            /* Align on 32-byte boundaries for 604 */
+#endif
+#endif
+
+#ifdef USE_MSL
+#define MSL_USE_PRECOMPILED_HEADERS 0  /* Don't use precomp headers: we include our own */
+#include <ansi_prefix.mac.h>
+#endif