Merged in changes for fixes to PPC support from vanilla branch.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@636 a95241bf-73f2-0310-859d-f6bbb57e9c96
2002-08-07 20:55:39 +00:00
parent 0b6140dc37
commit 70c87ab1f9
4 changed files with 3 additions and 11 deletions
@@ -366,7 +366,7 @@ else if $(MAC)
 	SUFLIB		?= .lib ;
 	SUFOBJ		?= .o ;
 }
-else if $(OS) = BEOS && $(METROWERKS)
+else if $(OS) = BEOS && $(OSPLAT) = PPC
 {
 	AR		?= mwld -xml -o ;
 	BINDIR		?= /boot/home/config/bin ;
@@ -29,15 +29,6 @@ CFLAGS =
 #CFLAGS = -DNT 
 #TARGET = /Fejam0

-# BeOS - Metroworks CodeWarrior
-#CC = mwcc
-#Include = /NewDisk/develop/headers/posix
-#CFLAGS = -I $(Include)
-
-# BeOS - gcc
-#CC = gcc
-#LINKLIBS = -lnet
-
 # Interix - gcc
 #CC = gcc

@@ -393,6 +393,7 @@
     defined( PPC ) || \
     defined( ppc ) || \
     defined( __powerpc__ ) || \
+     defined( __POWERPC__ ) || \
     defined( __ppc__ )
 # define OSPLAT "OSPLAT=PPC"
 # endif
@@ -185,7 +185,7 @@ char *jambase[] = {
 "SUFLIB		?= .lib ;\n",
 "SUFOBJ		?= .o ;\n",
 "}\n",
-"else if $(OS) = BEOS && $(METROWERKS)\n",
+"else if $(OS) = BEOS && $(OSPLAT) = PPC\n",
 "{\n",
 "AR		?= mwld -xml -o ;\n",
 "BINDIR		?= /boot/home/config/bin ;\n",