Intermediate version of changes after porting to MPW 3.2

1 files changed, 23 insertions, 23 deletions

diff --git a/Mac/README b/Mac/README
index 578ac2bc53..0550a7c2b5 100644
--- a/Mac/README
+++ b/Mac/README
@@ -5,10 +5,8 @@ Python can be built on the Mac using either THINK C 6.0 or MPW 3.2.
 In the past it has been compiled with earlier versions of these
 compilers, but no guarantees are made that the source is still
 compatible with those versions.  Likewise, new compiler versions may
-effectively change the language accepted (or the library!) and thus
-cause problems.
-
-[[MPW version and procedure must still be checked]]
+effectively change the language accepted (or the library provided!)
+and thus cause problems.
 
 
 1. Using Think C 6.0
@@ -102,21 +100,14 @@ arbitrarily because of the 32000 bytes restriction.
 	macmodule.c in the Mac subdirectory, so it should already have
 	been added in a previous step.)  Note that for most modules,
 	the source file is called <name>module.c, but for a few long
-	module names it is just <module>.c.
+	module names it is just <module>.c.  Don't add stdwinmodule.c
+	yet,
 
 The following THINK C libraries must be added: from Standard
 Libraries, ANSI and unix; from Mac Libraries, MacTraps.  I put each
 library in a separate segment.  Also see my earlier remark on 4-byte
 ints.
 
-1.3 Living without STDWIN
--------------------------
-
-Although STDWIN is really neat on the Mac, it's easier to begin
-building Python without it, so you can concentrate on the Python
-build.  To this end, you have to comment out the lines defining the
-symbol USE_STDWIN in macmain.c and config.c.
-
 1.4 Adding STDWIN
 -----------------
 
@@ -127,9 +118,10 @@ the same general source setup (in a sister directory of the toplevel
 Python directory).  Put all sources in the same segment.  To
 stdwin.pi, also add Tools/strdup.c and Gen/wtextbreak.c.
 
-The two projects can now be added as libraries to the Python project,
-and the two lines commented out to live without STDWIN should be
-reinstated.
+The two projects can now be added as libraries to the Python project.
+You must also add stdwinmodule.c and add "#define USE_STDWIN" to the
+Prefix in the compiler options dialog (this only affects macmain.c and
+config.c).
 
 Note that stdwinmodule.c contains an #include statement that
 references "stdwin.h" by relative path name -- if the stdwin toplevel
@@ -147,13 +139,21 @@ copies resources into the application file from a file
 <projectname>.rsrc.
 
 
-2. Using MPW
-============
-
-See the subdirectory MPW.  I haven't tried this recently.  You're
-supposed to merge the directory tree found here with the UNIX source
-tree.  I think this is intended for use with MPW 3.2.  The dynload
-stuff in not recommended.
+2. Using MPW 3.2
+================
+
+The subdirectory MPW contains a README.MPW file, a buildall script and
+several Makefiles (in respective subdirectories), kindly contributed
+by Richard Walker of Island Software.  Move these files to the
+corresponding locations relative to the Python root directory, and run
+the buildall script.  The README.MPW file contains more instructions
+and caveats (I've added some remarks of my own at the end).  I haven't
+tried building STDWIN with MPW recently (there is MPW specific code
+all over the STDWIN source but it is for a much older version of the
+compiler and library).  The MPW and THINK C ports share all source
+files, including config.c and config.h -- all differentiation is done
+based on #ifdef THINK_C or #ifdef MPW (#ifdef macintosh is used for
+code that should be seen by all Mac compilers).
 
 
 --Guido van Rossum, CWI, Amsterdam <Guido.van.Rossum@cwi.nl>