ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/makeall
(Generate patch)

Comparing ray/makeall (file contents):
Revision 1.8 by greg, Thu Jul 17 15:31:26 2003 UTC vs.
Revision 1.9 by schorsch, Sat Aug 30 08:22:47 2003 UTC

# Line 121 | Line 121 | set opt=
121   set mach=
122   set compat=
123   set extras=
124 + set esuffix=
125   cat << _EOF_
126  
127   Please select your system type from the following list:
# Line 131 | Line 132 | Please select your system type from the following list
132          4)      AIX (RS/6000)
133          5)      BSDI BSD/386
134          6)      Linux
135 <        7)      MacOS X
135 >        7)      MacOS X
136          8)      FreeBSD
137 <        9)      Other
137 >        9)      Cygwin
138 >        10)     Other
139  
140   _EOF_
141   echo -n "Choice? "
# Line 194 | Line 196 | case 6:                        # Linux
196          set compat="bmalloc.o erf.o getpagesize.o"
197          set extras=CC=gcc
198          breaksw
199 < case 7:                # MacOS X
200 <        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
201 <        set opt="-O2 -DSPEED=200"
202 <        set arch=PowerPC
203 <        set compat="bmalloc.o"
204 <        set extras="CC=cc CONFIGURE_ARCH=powerpc"
199 > case 7:                 # MacOS X
200 >        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
201 >        set opt="-O2 -DSPEED=200"
202 >        set arch=PowerPC
203 >        set compat="bmalloc.o"
204 >        set extras="CC=cc CONFIGURE_ARCH=powerpc"
205          set special="ogl"
206 <        breaksw
206 >        breaksw
207   case 8:                 # FreeBSD
208 <        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
209 <        set opt="-O -DSPEED=200"
210 <        set compat="bmalloc.o erf.o"
211 <        set extras="CC=cc"
208 >        set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
209 >        set opt="-O -DSPEED=200"
210 >        set compat="bmalloc.o erf.o"
211 >        set extras="CC=cc"
212          set arch=IBMPC
213 <        breaksw
214 < case 9:                 # Other
213 >        breaksw
214 > case 9:                 # Cygwin
215 >        set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
216 >        set opt="-O2 -DSPEED=200"
217 >        set arch=IBMPC
218 >        set compat="bmalloc.o erf.o getpagesize.o"
219 >        set extras="CC=gcc"
220 >        set special="ogl"
221 >        set esuffix=".exe"
222 >        breaksw
223 > case 10:                        # Other
224          set opt="-O"
225          set compat="bmalloc.o erf.o strcmp.o"
226          echo -n "Are you using the GNU C compiler [n]? "
# Line 233 | Line 244 | exec make "SPECIAL=$special" \
244          ARCH=$arch "COMPAT=$compat" \
245          INSTDIR=$idir \
246          LIBDIR=$ldir \
247 +        ESUFFIX=$esuffix \
248          $extras "\$@" -f Rmakefile
249   _EOF_
250   chmod 755 $rmake

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines