--- ray/makeall	2008/04/17 14:58:57	1.23
+++ ray/makeall	2009/10/31 22:29:06	1.24
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# RCSid $Id: makeall,v 1.23 2008/04/17 14:58:57 greg Exp $
+# RCSid $Id: makeall,v 1.24 2009/10/31 22:29:06 greg Exp $
 # 
 # Make all the Radiance programs
 #
@@ -100,15 +100,11 @@ cat << _EOF_
 Please select your system type from the following list:
 
 	1)	Sun Solaris
-	2)	HP workstation
-	3)	Silicon Graphics
-	4)	AIX (RS/6000)
-	5)	BSDI BSD/386
-	6)	Linux
-	7)	MacOS X
-	8)	FreeBSD
-	9)	Cygwin
-	10)	Other
+	2)	Linux
+	3)	MacOS X
+	4)	FreeBSD
+	5)	Cygwin
+	6)	Other
 
 _EOF_
 echo -n "Choice? "
@@ -120,72 +116,28 @@ case 1:			# SPARC Station
 	set opt="-O"
 	set compat="strcmp.o"
 	breaksw
-case 2:			# HP workstation
-	set mach=""
-	set opt="-O -Aa -D_HPUX_SOURCE"
-	set compat="strcmp.o"
-	set arch=hpux
-	breaksw
-case 3:			# Silicon Graphics
-	set arch=sgi
-	switch (`uname -r`)
-	case 3.*:
-		set mach="-noprototypes"
-		set opt="-O"
-		set special="sgi"
-		set compat="strcmp.o"
-		breaksw
-	case 4.*:
-		set mach=""
-		set opt="-O2"
-		set compat="strcmp.o"
-		set extras='"MLIB=-lfastm -lm"'
-		breaksw
-	default:	# 5.x or later
-		ln -s `which wish` $idir/wish4.0
-		set path=($idir $path)
-		set mach="-w"
-		set opt="-O2"
-		set special="ogl"
-		set compat="strcmp.o"
-		breaksw
-	endsw
-	breaksw
-case 4:			# AIX
-	set opt="-O"
-	set compat="erf.o strcmp.o"
-	set arch=PowerPC
-	breaksw
-case 5:			# BSDI BSD/386
-	set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
-	set opt="-O"
-	set arch=IBMPC
-	set compat="erf.o strcmp.o"
-	breaksw
-case 6:			# Linux
+case 2:			# Linux
 	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
 	set opt="-O2"
 	set arch=IBMPC
 	set compat="erf.o"
 	set extras=CC=gcc
 	breaksw
-case 7:			# MacOS X
+case 3:			# MacOS X
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
-	# Ugly fix for Leopard OpenGL link bug:
-	if (`uname -r` =~ 9.*) set mach="$mach -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
 	set opt="-O2"
-	set arch=PowerPC
-	set extras="CC=cc CONFIGURE_ARCH=powerpc"
+	set arch=Intel
+	set extras="CC=cc CONFIGURE_ARCH=i386"
 	set special="ogl"
 	breaksw
-case 8:			# FreeBSD
+case 4:			# FreeBSD
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
 	set opt="-O"
 	set compat="erf.o"
 	set extras='CC=cc MLIB="-lcompat -lm"'
 	set arch=IBMPC
 	breaksw
-case 9:			# Cygwin
+case 5:			# Cygwin
 	set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
 	set opt="-O2"
 	set arch=IBMPC
@@ -194,7 +146,7 @@ case 9:			# Cygwin
 	set special="ogl"
 	set esuffix=".exe"
 	breaksw
-case 10:			# Other
+case 6:			# Other
 	set opt="-O"
 	set compat="erf.o strcmp.o"
 	echo -n "Are you using the GNU C compiler [n]? "