We now only link weakly with AppearanceLib, which should let us run on PowerPCs

without the Appearance Manager.  Not that I've tested this, of course.

[originally from svn r140]

diff --git a/Makefile.mpw b/Makefile.mpw
index bd54e03f50fdb3104ef631b0da008a7be6b3e490..380a8b84f6ba44576c2949ee222f5386945de469 100644 (file)
--- a/Makefile.mpw
+++ b/Makefile.mpw
@@ -1,4 +1,4 @@
-# $Id: Makefile.mpw,v 1.1.2.6 1999/03/28 17:34:36 ben Exp $
+# $Id: Makefile.mpw,v 1.1.2.7 1999/03/29 23:55:06 ben Exp $
 # This is the Makefile for building PuTTY for the Mac OS.
 # Users of non-Mac systems will see some pretty strange characters around.
 
@@ -58,7 +58,7 @@ Libs
 Libs¥PPC  =    "{SharedLibraries}InterfaceLib" ¶
                "{SharedLibraries}StdCLib" ¶
                "{SharedLibraries}MathLib" ¶
-               "{SharedLibraries}AppearanceLib" ¶
+               "{SharedLibraries}AppearanceLib" -weaklib AppearanceLib ¶
                "{PPCLibraries}StdCRuntime.o" ¶
                "{PPCLibraries}PPCCRuntime.o"
 

diff --git a/README.mac b/README.mac
index bd761c1f86df42e9bb01d74868def2fe0d3f9732..716584448d18b4539bddb1ad9534d7f4969863a7 100644 (file)
--- a/README.mac
+++ b/README.mac
@@ -1,4 +1,4 @@
-$Id: README.mac,v 1.1.2.1 1999/03/29 19:51:40 ben Exp $
+$Id: README.mac,v 1.1.2.2 1999/03/29 23:55:06 ben Exp $
 
 Information about PuTTY for the Mac OS
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -6,7 +6,7 @@ Information about PuTTY for the Mac OS
 Known bugs:
 
  * PowerPC and fat versions fail to start on systems without AppearanceLib (ie
-   most System 7 ones).  The 68k version works fine.
+   most System 7 ones).  The 68k version works fine. [MAYBE FIXED]
  * If the screen scrolls more than once between calls to WaitNextEvent, Bad
    Things can happen owing to a bug in do_scroll.  This can be fixed when I
    have an easy way to test it.

diff --git a/mac.c b/mac.c
index 48187ec5f2aa2838a82aa2dcd6e83eb686eaf6cc..8b4e8c2bc1736949f7f726a3d0537e829c6973a4 100644 (file)
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.1.2.20 1999/03/29 19:50:22 ben Exp $ */
+/* $Id: mac.c,v 1.1.2.21 1999/03/29 23:55:06 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -117,6 +117,9 @@ static void mac_startup(void) {
            mac_gestalts.apprvers = 0x0100;
        else
            mac_gestalts.apprvers = 0;
+    /* Paranoia: Did we manage to pull in AppearanceLib? */
+    if (&RegisterAppearanceClient == NULL)
+       mac_gestalts.apprvers = 0;
     /* Mac OS 8.5 Control Manager (proportional scrollbars)? */
     if (Gestalt(gestaltControlMgrAttr, &mac_gestalts.cntlattr) != noErr)
        mac_gestalts.cntlattr = 0;