Anonymous avatar Anonymous committed e916d72

- sync to 1.8.1

Comments (0)

Files changed (4)

 
 #If you don't have FreeType, libjpeg and/or Xpm installed, including the
 #header files, uncomment this (default).
-#CFLAGS=-O
+CFLAGS=-O
 #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
 #variation of this and comment out the line above. See also LIBS below.
-CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
 
 #If you don't have FreeType and/or Xpm fully installed, uncomment this
 #(default).
-#LIBS=-lm -lgd -lpng -lz
+LIBS=-lm -lgd -lpng -lz
 
 #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
 #variation of this and comment out the line above. Note that
 #Xpm requires X11. See also CFLAGS above.
-LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
 
 #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
 #If yours are somewhere else, change this. 
+#NMAKE makefile for Windows 95/98/NT developers.
+#Produces a static library (libgd.lib). Thanks to Joe Gregorio.
+
+COMPILER=cl
+
+#If the ar command fails on your system, consult the ar manpage
+#for your system. 
+AR=LIB
+
+#If the install command is not in your path, provide
+#an explicit path for it here, or install manually.
+INSTALL=install
+
+#If you don't have FreeType and/or Xpm installed, including the
+#header files, uncomment this (default).
+CFLAGS=-Ox -GX 
+
+#If you do have FreeType and/or Xpm fully installed, uncomment a
+#variation of this and comment out the line above. See also LIBS below.
+#CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF
+
+#Libraries required for applications 
+LIBS=gd.lib libpng.lib zlib.lib 
+#LIBS=gd.lib libpng.lib zlib.lib libjpeg.lib libttf.lib
+
+#Libraries required for gd.lib itself
+GDLIBS=libpng.lib zlib.lib
+#GDLIBS=libpng.lib zlib.lib libjpeg.lib libttf.lib
+
+#Typical install locations for freetype, zlib, jpeg, xpm and 
+#libpng header files. If yours are somewhere else, change this. 
+INCLUDEDIRS=-I d:\zlib -I d:\libpng -I d:\libjpeg -I d:\libttf
+
+#Typical install locations for freetype, zlib, xpm, libjpeg and 
+#libpng libraries.
+#
+#If yours are somewhere else, other than a standard location
+#such as /lib or /usr/lib, then change this. Be sure to keep
+#-L. as this allows the gd library itself to be found.
+#Put -L. first so that old versions of the gd library elsewhere
+#on your system can't cause conflicts while building a new one.
+LIB=d:\devstudio\vc\lib;d:\zlib;d:\libpng;d:\libjpeg;d:\libttf
+
+#Location where gd.lib should be installed by "make install".
+INSTALL_LIB=/usr/local/lib
+
+#Location where .h files should be installed by "make install".
+INSTALL_INCLUDE=/usr/local/include
+
+#Location where useful non-test programs should be installed by "make install".
+INSTALL_BIN=/usr/local/bin
+
+#
+#
+# Changes should not be required below here.
+#
+#
+
+VERSION=1.8.1
+
+CC=$(COMPILER) $(INCLUDEDIRS)
+LINK=$(CC) $(LIBS)
+
+PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
+
+BIN_PROGRAMS=pngtogd.exe pngtogd2.exe gdtopng.exe gd2topng.exe gd2copypal.exe gdparttopng.exe webpng.exe
+TEST_PROGRAMS=gdtest.exe gddemo.exe gd2time.exe gdtestttf.exe
+
+all: gd.lib $(PROGRAMS)
+
+gddemo.exe: gddemo.c gd.lib
+	$(CC) gddemo.c $(LIBDIRS) $(LIBS)
+
+pngtogd.exe: pngtogd.c gd.lib
+	$(CC) pngtogd.c $(LIBDIRS) $(LIBS) 
+
+webpng.exe: webpng.c gd.lib
+	$(CC) webpng.c 	$(LIBDIRS) $(LIBS)
+
+pngtogd2.exe: pngtogd2.c gd.lib
+	$(CC) pngtogd2.c	$(LIBDIRS) $(LIBS)
+
+gdtopng.exe: gdtopng.c gd.lib
+	$(CC) gdtopng.c 	$(LIBDIRS) $(LIBS)
+
+gd2topng.exe: gd2topng.c gd.lib
+	$(CC) gd2topng.c	$(LIBDIRS) $(LIBS)
+
+gd2copypal.exe: gd2copypal.c gd.lib
+	$(CC) gd2copypal.c	$(LIBDIRS) $(LIBS)
+
+gdparttopng.exe: gdparttopng.c gd.lib
+	$(CC) gdparttopng.c	$(LIBDIRS) $(LIBS)
+
+gdtest.exe: gdtest.c gd.lib
+	$(CC) gdtest.c 	$(LIBDIRS) $(LIBS)
+
+gd2time.exe: gd2time.c gd.lib
+	$(CC) gd2time.c	$(LIBDIRS) $(LIBS)
+
+gdtestttf.exe: gdtestttf.c gd.lib
+	$(CC) gdtestttf.c 	$(LIBDIRS) $(LIBS)
+
+OBJS=gd.obj gd_gd.obj gd_gd2.obj gd_io.obj gd_io_dp.obj gd_io_file.obj gd_ss.obj \
+	gd_io_ss.obj gd_png.obj gdxpm.obj gdfontt.obj gdfonts.obj gdfontmb.obj gdfontl.obj \
+	gdfontg.obj gdtables.obj gdttf.obj gdcache.obj gdkanji.obj gd_jpeg.obj
+
+gd.lib:  $(OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h	
+	$(AR) $(OBJS) $(GDLIBS) 
+
+clean:
+	del *.obj *.lib $(PROGRAMS)
+
 <HTML>
 <HEAD>
-<TITLE>gd 1.8</TITLE>
+<TITLE>gd 1.8.1</TITLE>
 </HEAD>
 <BODY>
 <!-- BANNER HERE -->
-<H1>gd 1.8</H1>
+<H1>gd 1.8.1</H1>
 <H2>A graphics library for fast image creation</H2>
 <H2>Follow this link to the
 <A HREF="http://www.boutell.com/gd/">latest version
 of this document</A>.</H2>
 <blockquote>
 <strong>HEY! READ THIS!</strong>
-gd 1.8 creates PNG, JPEG and WBMP images, not GIF images. This is a good
+gd 1.8.1 creates PNG, JPEG and WBMP images, not GIF images. This is a good
 thing.  PNG is a more compact format, and full compression is
 available.  JPEG works well with photographic images, and is still
 more compatible with the major Web browsers than even PNG is. WBMP is
 solution is to move to legally unencumbered, well-compressed,
 modern image formats such as PNG and JPEG as soon as possible.
 <p>
-gd 1.8 <strong>requires</strong> that the following libraries 
+gd 1.8.1 <strong>requires</strong> that the following libraries 
 also be installed:
 <p>
 libpng
 <H3>Table of Contents</H3>
 <UL>
 <LI><A HREF="#notice">Credits and license terms</A>
+<LI><A HREF="#whatsnew1.8.1">What's new in version 1.8.1?</A>
 <LI><A HREF="#whatsnew1.8">What's new in version 1.8?</A>
 <LI><A HREF="#whatsnew1.7.3">What's new in version 1.7.3?</A>
 <LI><A HREF="#whatsnew1.7.2">What's new in version 1.7.2?</A>
 fitness for a particular purpose, with respect to this code and accompanying
 documentation.
 <p>
-Although their code does not appear in gd 1.8, the authors wish to 
+Although their code does not appear in gd 1.8.1, the authors wish to 
 thank David Koblas, David Rowley, and Hutchison Avenue Software 
 Corporation for their prior contributions.
 </blockquote>
 <li><a href="http://s27w007.pswfs.gov/tgd/">tgd</a>, by Bradley K. Sherman
 <li><a href="http://www.unimelb.edu.au/fly/fly.html">fly</a>, by Martin Gleeson
 </ul>
+<P><A NAME="whatsnew1.8.1"><H3>What's new in version 1.8.1?</H3></A>
+<ul>
+<li>Optional components no longer built by default (following the
+documentation)
+<li>JPEG code no longer requires inappropriate header files
+<li>Win32 patches from Joe Gregorio
+<li>16-bit font support for bdftogd, from Honza Pazdziora
+</ul>
 <P><A NAME="whatsnew1.8"><H3>What's new in version 1.8?</H3></A>
 <ul>
 <li>Support for JPEG output, courtesy of Doug Becker
 <A NAME="getgd"><H3>How do I get gd?</H3></A>
 <h4>By HTTP</h4>
 <ul>
-<li><a href="http://www.boutell.com/gd/http/gd-1.8.tar.gz">Gzipped Tar File (Unix)</a>
-<li><a href="http://www.boutell.com/gd/http/gd-1.8.zip">.ZIP File (Windows)</a>
+<li><a href="http://www.boutell.com/gd/http/gd-1.8.1.tar.gz">Gzipped Tar File (Unix)</a>
+<li><a href="http://www.boutell.com/gd/http/gd-1.8.1.zip">.ZIP File (Windows)</a>
 </ul>
 <h4>By FTP</h4>
 <ul>
-<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd-1.8.tar.gz">Gzipped Tar File (Unix)</a>
-<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd-1.8.zip">.ZIP File (Windows)</a>
+<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd-1.8.1.tar.gz">Gzipped Tar File (Unix)</a>
+<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd-1.8.1.zip">.ZIP File (Windows)</a>
 </ul>
 <P>
 <A NAME="buildgd"><H3>How do I build gd?</H3></A>
 consult with an experienced user of your system. Sorry, we cannot
 answer questions about basic Internet skills.
 <p>
-Unpacking the archive will produce a directory called "gd-1.8".
+Unpacking the archive will produce a directory called "gd-1.8.1".
 <p>
 <h4>For Unix</h4>
-<code>cd</code> to the 1.8 directory. Edit the Makefile with
+<code>cd</code> to the 1.8.1 directory. Edit the Makefile with
 your preferred text editor and make any necessary changes to the
 settings at the top, especially if you want Xpm or TrueType support.
 Next, type "make". If you are the system administrator, and you
 
-                                    gd 1.8
+                                   gd 1.8.1
                                        
 A graphics library for fast image creation
 
 Follow this link to the latest version of this document.
 
-     _HEY! READ THIS!_ gd 1.8 creates PNG, JPEG and WBMP images, not GIF
-     images. This is a good thing. PNG is a more compact format, and
+     _HEY! READ THIS!_ gd 1.8.1 creates PNG, JPEG and WBMP images, not
+     GIF images. This is a good thing. PNG is a more compact format, and
      full compression is available. JPEG works well with photographic
      images, and is still more compatible with the major Web browsers
      than even PNG is. WBMP is intended for wireless devices (not
      well-compressed, modern image formats such as PNG and JPEG as soon
      as possible.
      
-     gd 1.8 _requires_ that the following libraries also be installed:
+     gd 1.8.1 _requires_ that the following libraries also be installed:
      
      libpng
      
   Table of Contents
   
      * Credits and license terms
+     * What's new in version 1.8.1?
      * What's new in version 1.8?
      * What's new in version 1.7.3?
      * What's new in version 1.7.2?
      particular purpose, with respect to this code and accompanying
      documentation.
      
-     Although their code does not appear in gd 1.8, the authors wish to
-     thank David Koblas, David Rowley, and Hutchison Avenue Software
+     Although their code does not appear in gd 1.8.1, the authors wish
+     to thank David Koblas, David Rowley, and Hutchison Avenue Software
      Corporation for their prior contributions.
      
 END OF COPYRIGHT STATEMENT
      * tgd, by Bradley K. Sherman
      * fly, by Martin Gleeson
        
+  What's new in version 1.8.1?
+  
+     * Optional components no longer built by default (following the
+       documentation)
+     * JPEG code no longer requires inappropriate header files
+     * Win32 patches from Joe Gregorio
+     * 16-bit font support for bdftogd, from Honza Pazdziora
+       
   What's new in version 1.8?
   
      * Support for JPEG output, courtesy of Doug Becker
    (Windows), please consult with an experienced user of your system.
    Sorry, we cannot answer questions about basic Internet skills.
    
-   Unpacking the archive will produce a directory called "gd-1.8".
+   Unpacking the archive will produce a directory called "gd-1.8.1".
    
     For Unix
     
-   cd to the 1.8 directory. Edit the Makefile with your preferred text
+   cd to the 1.8.1 directory. Edit the Makefile with your preferred text
    editor and make any necessary changes to the settings at the top,
    especially if you want Xpm or TrueType support. Next, type "make". If
    you are the system administrator, and you wish to make the gd library
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.