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.15 by greg, Wed Feb 2 00:09:13 2005 UTC vs.
Revision 1.23 by greg, Thu Apr 17 14:58:57 2008 UTC

# Line 16 | Line 16 | if ( "$1" == library ) then
16          echo "Set the environment variable RAYPATH=.:$ldir"
17          echo 'For C-shell users, put the following into ~/.cshrc'
18          echo "  setenv RAYPATH .:$ldir"
19 <        echo 'For Bourne shell users, put the following into $HOME/profile'
19 >        echo 'For Bourne shell users, put the following into $HOME/.profile'
20          echo "  RAYPATH=.:$ldir"
21          echo "  export RAYPATH"
22          echo ""
23          exit 0
24   endif
25 < set srcdirs=( common meta cv gen ot rt px hd util cal )
25 > set srcdirs=( common rt meta cv gen ot px hd util cal )
26   if ( "$1" == install ) then
27          cat << _EOF_
28  
# Line 117 | Line 117 | switch ("$arch")
117   case 1:                 # SPARC Station
118          set arch=sun
119          set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
120 <        set opt="-O -DSPEED=80"
120 >        set opt="-O"
121          set compat="strcmp.o"
122          breaksw
123   case 2:                 # HP workstation
124          set mach=""
125 <        set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
125 >        set opt="-O -Aa -D_HPUX_SOURCE"
126          set compat="strcmp.o"
127          set arch=hpux
128          breaksw
# Line 131 | Line 131 | case 3:                        # Silicon Graphics
131          switch (`uname -r`)
132          case 3.*:
133                  set mach="-noprototypes"
134 <                set opt="-O -DSPEED=80"
134 >                set opt="-O"
135                  set special="sgi"
136                  set compat="strcmp.o"
137                  breaksw
138          case 4.*:
139                  set mach=""
140 <                set opt="-O2 -DSPEED=100"
140 >                set opt="-O2"
141                  set compat="strcmp.o"
142                  set extras='"MLIB=-lfastm -lm"'
143                  breaksw
# Line 145 | Line 145 | case 3:                        # Silicon Graphics
145                  ln -s `which wish` $idir/wish4.0
146                  set path=($idir $path)
147                  set mach="-w"
148 <                set opt="-O2 -DSPEED=200"
148 >                set opt="-O2"
149                  set special="ogl"
150                  set compat="strcmp.o"
151                  breaksw
# Line 158 | Line 158 | case 4:                        # AIX
158          breaksw
159   case 5:                 # BSDI BSD/386
160          set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
161 <        set opt="-O -DSPEED=100"
161 >        set opt="-O"
162          set arch=IBMPC
163          set compat="erf.o strcmp.o"
164          breaksw
165   case 6:                 # Linux
166          set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
167 <        set opt="-O2 -DSPEED=200"
167 >        set opt="-O2"
168          set arch=IBMPC
169          set compat="erf.o"
170          set extras=CC=gcc
171          breaksw
172   case 7:                 # MacOS X
173          set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
174 <        set opt="-O2 -DSPEED=200"
174 >        # Ugly fix for Leopard OpenGL link bug:
175 >        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"
176 >        set opt="-O2"
177          set arch=PowerPC
178          set extras="CC=cc CONFIGURE_ARCH=powerpc"
179          set special="ogl"
180          breaksw
181   case 8:                 # FreeBSD
182          set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
183 <        set opt="-O -DSPEED=200"
183 >        set opt="-O"
184          set compat="erf.o"
185 <        set extras="CC=cc"
185 >        set extras='CC=cc MLIB="-lcompat -lm"'
186          set arch=IBMPC
187          breaksw
188   case 9:                 # Cygwin
189          set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
190 <        set opt="-O2 -DSPEED=200"
190 >        set opt="-O2"
191          set arch=IBMPC
192          set compat="erf.o"
193          set extras="CC=gcc"
# Line 260 | Line 262 | if (! $inpath ) then
262          echo "Add $idir to the beginning of your execution path:"
263          echo 'For C-shell users, put the following into ~/.cshrc'
264          echo "  set path=( $idir "'$path )'
265 <        echo 'For Bourne shell users, put the following into $HOME/profile'
265 >        echo 'For Bourne shell users, put the following into $HOME/.profile'
266          echo "  PATH=$idir"':$PATH'
267          echo "  export PATH"
268   endif
# Line 276 | Line 278 | cd ..
278   foreach i ( $* )
279          if ( "$i" == clean ) then
280                  echo "Removing library archives..."
281 <                rm -f src/lib/*.[ao]
281 >                rm -f src/lib/*.{a,o,la}
282          endif
283   end
284   echo "Done."

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines