From 388a864ef72fee59c80239209c770878f27d92ab Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 6 Jul 2004 00:18:49 +0000 Subject: Makefile and configure script support for image libs. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3644 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- Makefile | 6 +- configure.in | 103 +++--- fltk-config.in | 6 +- jpeg/Makefile | 24 +- makeinclude.in | 14 +- png/Makefile | 24 +- vcnet/jpeg.vcproj | 1012 +++++++++++++++++++++++++++++++++++++++++++++++++++ vcnet/libpng.vcproj | 421 +++++++++++++++++++++ vcnet/zlib.vcproj | 382 +++++++++++++++++++ visualc/jpeg.dsp | 284 +++++++++++++++ visualc/libpng.dsp | 149 ++++++++ visualc/zlib.dsp | 141 +++++++ zlib/Makefile | 24 +- 13 files changed, 2522 insertions(+), 68 deletions(-) create mode 100644 vcnet/jpeg.vcproj create mode 100644 vcnet/libpng.vcproj create mode 100644 vcnet/zlib.vcproj create mode 100644 visualc/jpeg.dsp create mode 100644 visualc/libpng.dsp create mode 100644 visualc/zlib.dsp diff --git a/Makefile b/Makefile index 0f0e42998..976c563c8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.12.2.6.2.17 2004/04/11 04:38:53 easysw Exp $" +# "$Id: Makefile,v 1.12.2.6.2.18 2004/07/06 00:18:48 easysw Exp $" # # Top-level makefile for the Fast Light Tool Kit (FLTK). # @@ -25,7 +25,7 @@ include makeinclude -DIRS = src fluid test documentation +DIRS = $(IMAGEDIRS) src fluid test documentation all: makeinclude for dir in $(DIRS); do\ @@ -97,5 +97,5 @@ native-dist: # -# End of "$Id: Makefile,v 1.12.2.6.2.17 2004/04/11 04:38:53 easysw Exp $". +# End of "$Id: Makefile,v 1.12.2.6.2.18 2004/07/06 00:18:48 easysw Exp $". # diff --git a/configure.in b/configure.in index f760bc1de..1a25c9adc 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.111 2004/07/05 13:20:28 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.112 2004/07/06 00:18:48 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -362,54 +362,57 @@ IMAGELIBS="" AC_SUBST(IMAGELIBS) -AC_ARG_ENABLE(jpeg, [ --enable-jpeg enable JPEG image support]) -AC_ARG_WITH(jpeg-libs, [ --with-jpeg-libs set directory for JPEG library], - LDFLAGS="-L$withval $LDFLAGS",) -AC_ARG_WITH(jpeg-includes, [ --with-jpeg-includes set directory for JPEG includes], - CFLAGS="-I$withval $CFLAGS" - CXXFLAGS="-I$withval $CXXFLAGS" - CPPFLAGS="-I$withval $CPPFLAGS",) - -if test "x$ac_enable_jpeg" != xno; then - AC_CHECK_HEADER(jpeglib.h, - AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, - AC_DEFINE(HAVE_LIBJPEG) - IMAGELIBS="$IMAGELIBS -ljpeg")) -fi - -AC_ARG_ENABLE(png, [ --enable-png enable PNG image support]) -AC_ARG_WITH(png-libs, [ --with-png-libs set directory for PNG library], - LDFLAGS="-L$withval $LDFLAGS",) -AC_ARG_WITH(png-includes, [ --with-png-includes set directory for PNG includes], - CFLAGS="-I$withval $CFLAGS" - CXXFLAGS="-I$withval $CXXFLAGS" - CPPFLAGS="-I$withval $CPPFLAGS",) - -AC_ARG_WITH(zlib-libs, [ --with-zlib-libs set directory for ZLIB library], - LDFLAGS="-L$withval $LDFLAGS",) -AC_ARG_WITH(zlib-includes, [ --with-zlib-includes set directory for ZLIB includes], - CFLAGS="-I$withval $CFLAGS" - CXXFLAGS="-I$withval $CXXFLAGS" - CPPFLAGS="-I$withval $CPPFLAGS",) - -if test "x$ac_enable_png" != xno; then - AC_CHECK_HEADER(zlib.h, - AC_CHECK_LIB(z, gzopen, - AC_DEFINE(HAVE_LIBZ) - IMAGELIBS="$IMAGELIBS -lz" - LIBS="$LIBS -lz")) - - AC_CHECK_HEADER(png.h, AC_DEFINE(HAVE_PNG_H)) - AC_CHECK_HEADER(libpng/png.h, AC_DEFINE(HAVE_LIBPNG_PNG_H)) - - if test x$ac_cv_header_png_h = xyes -o x$ac_cv_header_libpng_png_h = xyes; then - AC_CHECK_LIB(png, png_read_rows, - [AC_DEFINE(HAVE_LIBPNG) - IMAGELIBS="-lpng $IMAGELIBS" - LIBS="-lpng $LIBS" - AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha)]) - fi -fi +AC_ARG_ENABLE(localjpeg, [ --enable-localjpeg use local JPEG library, default=auto], + [if eval "test x$enable_localjpeg = xyes"; then + ac_cv_lib_jpeg_jpeg_CreateCompress=no + fi]) + +AC_CHECK_LIB(jpeg,jpeg_CreateCompress, + JPEGINC="" + JPEG="" + IMAGELIBS="-ljpeg $IMAGELIBS", + JPEGINC="-I../jpeg" + JPEG="jpeg" + IMAGELIBS="../jpeg/libjpeg.a $IMAGELIBS") + +AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=auto], + [if eval "test x$enable_localzlib = xyes"; then + ac_cv_lib_z_gzgets=no + fi]) + +AC_CHECK_LIB(z,gzgets, + ZLIBINC="" + ZLIB="" + LIBS="-lz $LIBS" + IMAGELIBS="-lz $IMAGELIBS", + ZLIBINC="-I../zlib" + ZLIB="zlib" + LIBS="../zlib/libz.a $LIBS" + IMAGELIBS="../zlib/libz.a $IMAGELIBS") + +AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=auto], + [if eval "test x$enable_localpng = xyes"; then + ac_cv_lib_png_png_set_tRNS_to_alpha=no + fi]) + +AC_CHECK_LIB(png,png_set_tRNS_to_alpha, + PNGINC="" + PNG="" + IMAGELIBS="-lpng $IMAGELIBS", + PNGINC="-I../png" + PNG="png" + IMAGELIBS="../png/libpng.a $IMAGELIBS") + +AC_SUBST(JPEG) +AC_SUBST(JPEGINC) +AC_SUBST(PNG) +AC_SUBST(PNGINC) +AC_SUBST(ZLIB) +AC_SUBST(ZLIBINC) + +AC_DEFINE(HAVE_LIBJPEG) +AC_DEFINE(HAVE_LIBPNG) +AC_DEFINE(HAVE_LIBZ) dnl Restore original LIBS settings... LIBS="$SAVELIBS" @@ -891,5 +894,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.111 2004/07/05 13:20:28 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.112 2004/07/06 00:18:48 easysw Exp $". dnl diff --git a/fltk-config.in b/fltk-config.in index 757bc1b56..a1d828b43 100755 --- a/fltk-config.in +++ b/fltk-config.in @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: fltk-config.in,v 1.12.2.21 2004/06/01 14:49:51 easysw Exp $" +# "$Id: fltk-config.in,v 1.12.2.22 2004/07/06 00:18:48 easysw Exp $" # # FLTK configuration utility. # @@ -59,7 +59,7 @@ LDLIBS="@LIBS@" LIBNAME="@LIBNAME@" DSONAME="@DSONAME@" DSOLINK="@DSOLINK@" -IMAGELIBS="@IMAGELIBS@" +IMAGELIBS="-ljpeg -lpng -lz" SHAREDSUFFIX="@SHAREDSUFFIX@" usage () @@ -266,5 +266,5 @@ if test "$echo_libs" = "yes"; then fi # -# End of "$Id: fltk-config.in,v 1.12.2.21 2004/06/01 14:49:51 easysw Exp $". +# End of "$Id: fltk-config.in,v 1.12.2.22 2004/07/06 00:18:48 easysw Exp $". # diff --git a/jpeg/Makefile b/jpeg/Makefile index b02b1d66a..eb3e592bb 100644 --- a/jpeg/Makefile +++ b/jpeg/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.1 2004/07/05 14:12:36 easysw Exp $" +# "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:48 easysw Exp $" # # JPEG library makefile for the Fast Light Toolkit (FLTK). # @@ -58,6 +58,26 @@ clean: $(RM) libjpeg.a +# +# Install everything... +# + +install: + echo "Installing libjpeg.a in $(libdir)..." + -$(MKDIR) $(libdir) + $(RM) $(libdir)/libjpeg.a + -$(CP) libjpeg.a $(libdir) + + +# +# Uninstall everything... +# + +uninstall: + echo "Uninstalling libjpeg.a in $(libdir)..." + $(RM) $(libdir)/libjpeg.a + + # # libjpeg.a # @@ -81,5 +101,5 @@ include makedepend $(OBJS): ../makeinclude # -# End of "$Id: Makefile,v 1.1.2.1 2004/07/05 14:12:36 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:48 easysw Exp $". # diff --git a/makeinclude.in b/makeinclude.in index 4983d6875..349ba508b 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -1,8 +1,7 @@ # -# "$Id: makeinclude.in,v 1.7.2.11.2.26 2004/04/11 04:38:53 easysw Exp $" +# "$Id: makeinclude.in,v 1.7.2.11.2.27 2004/07/06 00:18:48 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). -# @configure_input@ # # Copyright 1998-2004 by Bill Spitzak and others. # @@ -79,6 +78,9 @@ LINKFLTKIMG = -L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS) LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) IMAGELIBS = @IMAGELIBS@ +# image libraries to build... +IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@ + # The extension to use for executables... EXEEXT = @EXEEXT@ @@ -106,16 +108,16 @@ CAT3EXT = @CAT3EXT@ .o$(EXEEXT): echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r .c.o: echo Compiling $<... - $(CC) -I.. $(CFLAGS) -c $< + $(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< .cxx.o: echo Compiling $<... - $(CXX) -I.. $(CXXFLAGS) -c $< + $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< .man.0 .man.1 .man.3: echo Formatting $<... @@ -130,5 +132,5 @@ CAT3EXT = @CAT3EXT@ mv t.z $@ # -# End of "$Id: makeinclude.in,v 1.7.2.11.2.26 2004/04/11 04:38:53 easysw Exp $". +# End of "$Id: makeinclude.in,v 1.7.2.11.2.27 2004/07/06 00:18:48 easysw Exp $". # diff --git a/png/Makefile b/png/Makefile index 57ec21ed7..844f3c256 100644 --- a/png/Makefile +++ b/png/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.1 2004/07/05 14:12:37 easysw Exp $" +# "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:48 easysw Exp $" # # PNG library makefile for the Fast Light Toolkit (FLTK). # @@ -50,6 +50,26 @@ clean: $(RM) libpng.a +# +# Install everything... +# + +install: libpng.a + echo "Installing libpng.a in $(libdir)..." + -$(MKDIR) $(libdir) + $(RM) $(libdir)/libpng.a + -$(CP) libpng.a $(libdir) + + +# +# Uninstall everything... +# + +uninstall: + echo "Uninstalling libpng.a in $(libdir)..." + $(RM) $(libdir)/libpng.a + + # # libpng.a # @@ -74,5 +94,5 @@ $(OBJS): ../makeinclude # -# End of "$Id: Makefile,v 1.1.2.1 2004/07/05 14:12:37 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:48 easysw Exp $". # diff --git a/vcnet/jpeg.vcproj b/vcnet/jpeg.vcproj new file mode 100644 index 000000000..d67d3f76f --- /dev/null +++ b/vcnet/jpeg.vcproj @@ -0,0 +1,1012 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcnet/libpng.vcproj b/vcnet/libpng.vcproj new file mode 100644 index 000000000..6ee9094bd --- /dev/null +++ b/vcnet/libpng.vcproj @@ -0,0 +1,421 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcnet/zlib.vcproj b/vcnet/zlib.vcproj new file mode 100644 index 000000000..92c8ab9b5 --- /dev/null +++ b/vcnet/zlib.vcproj @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/visualc/jpeg.dsp b/visualc/jpeg.dsp new file mode 100644 index 000000000..605098f10 --- /dev/null +++ b/visualc/jpeg.dsp @@ -0,0 +1,284 @@ +# Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=jpeg - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "jpeg.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "jpeg.mak" CFG="jpeg - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "jpeg - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "jpeg - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "jpeg - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# SUBTRACT CPP /Os +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"jpeg.lib" + +!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /GX /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"jpegd.lib" + +!ENDIF + +# Begin Target + +# Name "jpeg - Win32 Release" +# Name "jpeg - Win32 Debug" +# Begin Source File + +SOURCE=..\jpeg\jcapimin.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcapistd.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jccoefct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jccolor.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcdctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jchuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcinit.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcmainct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcmarker.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcmaster.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcomapi.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcparam.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcphuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcprepct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jcsample.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jctrans.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdapimin.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdapistd.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdatadst.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdatasrc.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdcoefct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdcolor.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jddctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdhuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdinput.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdmainct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdmarker.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdmaster.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdmerge.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdphuff.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdpostct.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdsample.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jdtrans.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jerror.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jfdctflt.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jfdctfst.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jfdctint.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jidctflt.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jidctfst.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jidctint.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jidctred.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jmemmgr.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jmemnobs.c + +!IF "$(CFG)" == "jpeg - Win32 Release" + +# ADD CPP /MT + +!ELSEIF "$(CFG)" == "jpeg - Win32 Debug" + +# ADD CPP /MTd + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jpegtran.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jquant1.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jquant2.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\jutils.c +# End Source File +# End Target +# End Project diff --git a/visualc/libpng.dsp b/visualc/libpng.dsp new file mode 100644 index 000000000..39be89426 --- /dev/null +++ b/visualc/libpng.dsp @@ -0,0 +1,149 @@ +# Microsoft Developer Studio Project File - Name="libpng" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libpng - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libpng.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libpng - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libpng - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libpng - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# SUBTRACT CPP /Os +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"png.lib" + +!ELSEIF "$(CFG)" == "libpng - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /GX /Zi /Od /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"pngd.lib" + +!ENDIF + +# Begin Target + +# Name "libpng - Win32 Release" +# Name "libpng - Win32 Debug" +# Begin Source File + +SOURCE=..\png\png.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngerror.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngget.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngmem.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngpread.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngread.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngrio.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngrtran.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngrutil.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngset.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngtest.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngtrans.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngwio.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngwrite.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngwtran.c +# End Source File +# Begin Source File + +SOURCE=..\png\pngwutil.c +# End Source File +# End Target +# End Project diff --git a/visualc/zlib.dsp b/visualc/zlib.dsp new file mode 100644 index 000000000..0fec5b9ac --- /dev/null +++ b/visualc/zlib.dsp @@ -0,0 +1,141 @@ +# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=zlib - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "zlib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "zlib - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# SUBTRACT CPP /Os +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"z.lib" + +!ELSEIF "$(CFG)" == "zlib - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /GX /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"zd.lib" + +!ENDIF + +# Begin Target + +# Name "zlib - Win32 Release" +# Name "zlib - Win32 Debug" +# Begin Source File + +SOURCE=..\zlib\adler32.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\compress.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\crc32.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\deflate.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\gzio.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\infblock.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\infcodes.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\inffast.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\inflate.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\inftrees.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\infutil.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\trees.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\uncompr.c +# End Source File +# Begin Source File + +SOURCE=..\zlib\zutil.c +# End Source File +# End Target +# End Project diff --git a/zlib/Makefile b/zlib/Makefile index ff505e2fd..57a382285 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.1 2004/07/05 14:12:37 easysw Exp $" +# "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:49 easysw Exp $" # # GNU ZIP library makefile for the Fast Light Toolkit (FLTK). # @@ -51,6 +51,26 @@ clean: $(RM) libz.a +# +# Install everything... +# + +install: libz.a + echo "Installing libz.a in $(libdir)..." + -$(MKDIR) $(libdir) + $(RM) $(libdir)/libz.a + -$(CP) libz.a $(libdir) + + +# +# Uninstall everything... +# + +uninstall: + echo "Uninstalling libz.a in $(libdir)..." + $(RM) $(libdir)/libz.a + + # # libz.a # @@ -74,5 +94,5 @@ $(OBJS): ../makeinclude # -# End of "$Id: Makefile,v 1.1.2.1 2004/07/05 14:12:37 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:49 easysw Exp $". # -- cgit v1.2.3