*** ./source/unix/makefile.ORIG Fri Jan 15 14:17:06 2010 --- ./source/unix/makefile Fri Jan 15 14:23:55 2010 *************** *** 51,57 **** #CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) # Linux compiler flags, Pentium II optimized ! CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) # HPUX compiler flags #CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) --- 51,57 ---- #CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) # Linux compiler flags, Pentium II optimized ! #CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) # HPUX compiler flags #CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) *************** *** 59,66 **** # IRIX 6.5 compiler flags, courtesy Johan Eriksson #CFLAGS = -O2 -n32 -mips4 -r1000 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC) # Your compiler ! CC = gcc # The X11 variable should point to the top-level directory where the X11 # libraries and include files are located. It should really be set in --- 59,69 ---- # IRIX 6.5 compiler flags, courtesy Johan Eriksson #CFLAGS = -O2 -n32 -mips4 -r1000 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC) + # AIX5L V5.1 with XLC/C++ V7 + CFLAGS = -O -q32 -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC) + # Your compiler ! CC = cc # The X11 variable should point to the top-level directory where the X11 # libraries and include files are located. It should really be set in *************** *** 74,82 **** #X11 = /usr/openwin # for some AIX systems: ! #X11 = /usr/lpp/X11 ! X11 = /usr/X11R6 # You probably won't need to change these if you have the X11 variable # above set properly... --- 77,85 ---- #X11 = /usr/openwin # for some AIX systems: ! X11 = /usr/lpp/X11 ! #X11 = /usr/X11R6 # You probably won't need to change these if you have the X11 variable # above set properly... *************** *** 88,97 **** # Use libXXX.a if you want to force static linking of the libraries. # Use -Llibdir -lXXX if you want to use shared libraries (if they are # available). It doesn't matter if you only have libXXX.a libraries. ! PNGDIR = $(SRCDIR)/libpng LIBPNGINC = -I$(PNGDIR) #LIBPNGLIB = $(PNGDIR)/libpng.a ! LIBPNGLIB = -L$(PNGDIR) -lpng #LIBPNGLIB = -L/usr/local/lib -lpng # The following options are added at the suggestion of Axel Hecht --- 91,100 ---- # Use libXXX.a if you want to force static linking of the libraries. # Use -Llibdir -lXXX if you want to use shared libraries (if they are # available). It doesn't matter if you only have libXXX.a libraries. ! PNGDIR = /opt/freeware/include LIBPNGINC = -I$(PNGDIR) #LIBPNGLIB = $(PNGDIR)/libpng.a ! LIBPNGLIB = -L/opt/freeware/lib -lpng #LIBPNGLIB = -L/usr/local/lib -lpng # The following options are added at the suggestion of Axel Hecht *************** *** 101,110 **** # LIBPNGINC = -I$(LIBPNGINCDIR) # LIBPNGLIB = -L$(PREFIX)/lib -lpng ! ZLIBDIR = $(SRCDIR)/zlib ZLIBINC = -I$(ZLIBDIR) #ZLIBLIB = $(ZLIBDIR)/libz.a ! ZLIBLIB = -L$(ZLIBDIR) -lz #ZLIBLIB = -L/usr/local/lib -lz # The following options are added at the suggestion of Axel Hecht --- 104,113 ---- # LIBPNGINC = -I$(LIBPNGINCDIR) # LIBPNGLIB = -L$(PREFIX)/lib -lpng ! ZLIBDIR = /opt/freeware/include ZLIBINC = -I$(ZLIBDIR) #ZLIBLIB = $(ZLIBDIR)/libz.a ! ZLIBLIB = -L/opt/freeware/lib -lz #ZLIBLIB = -L/usr/local/lib -lz # The following options are added at the suggestion of Axel Hecht *************** *** 127,138 **** #default: svga # Define the default POV-Ray library location ! POVLIBDIR = /usr/local/lib/povray31 # Define the path under which you want POV-Ray files to be installed, # typically /usr/local/bin, though Linux distributions may wish to # alter this to /usr/bin ! POVPATH = /usr/local #---------------------------------------------------------------------- # There should be no compelling reason to customize the makefile beyond --- 130,141 ---- #default: svga # Define the default POV-Ray library location ! POVLIBDIR = /opt/freeware/share/povray31 # Define the path under which you want POV-Ray files to be installed, # typically /usr/local/bin, though Linux distributions may wish to # alter this to /usr/bin ! POVPATH = /opt/freeware #---------------------------------------------------------------------- # There should be no compelling reason to customize the makefile beyond *** ./source/unix/povrayrc.ORIG Fri Jan 15 14:25:40 2010 --- ./source/unix/povrayrc Fri Jan 15 14:27:12 2010 *************** *** 21,28 **** ;; Search path for #include source files or command line ini files not ;; found in the current directory. New directories are added to the ;; search path, up to a maximum of 25. ! Library_Path=/usr/local/lib/povray31 ;; (+Ldir) ! Library_Path=/usr/local/lib/povray31/include ;; Image size. --- 21,28 ---- ;; Search path for #include source files or command line ini files not ;; found in the current directory. New directories are added to the ;; search path, up to a maximum of 25. ! Library_Path=/opt/freeware/share/povray31 ;; (+Ldir) ! Library_Path=/opt/freeware/share/povray31/include ;; Image size. *** ./source/optout.h.ORIG Sat Jun 19 03:13:53 1999 --- ./source/optout.h Fri Jan 15 14:30:59 2010 *************** *** 36,42 **** #define POV_RAY_VERSION "3.1g" #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:" ! #define DISTRIBUTION_MESSAGE_2 "FILL IN NAME HERE........................." #define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version." /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */ --- 36,42 ---- #define POV_RAY_VERSION "3.1g" #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:" ! #define DISTRIBUTION_MESSAGE_2 "Michael Perzl (michael@perzl.org)" #define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version." /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */