cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Andrey Kiselev 2004-04-15 09:48:25 +00:00
parent 90d7d78882
commit 2b90981925
6 changed files with 103 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -27,11 +27,13 @@ EXTRA_DIST = \
COPYRIGHT \
ChangeLog \
HOWTO-RELEASE \
Makefile.vc \
README \
RELEASE-DATE \
TODO \
VERSION \
autogen.sh
autogen.sh \
nmake.opt
SUBDIRS = port libtiff tools contrib man html

4
Makefile.in
View File

@ -200,11 +200,13 @@ EXTRA_DIST = \
COPYRIGHT \
ChangeLog \
HOWTO-RELEASE \
Makefile.vc \
README \
RELEASE-DATE \
TODO \
VERSION \
autogen.sh
autogen.sh \
nmake.opt
SUBDIRS = port libtiff tools contrib man html
all: all-recursive

35
Makefile.vc Normal file
View File

@ -0,0 +1,35 @@
#
# Simple MS VC++ Makefile
#
# To build:
# C:\libtiff\tools> nmake /f makefile.vc
!INCLUDE ..\nmake.opt
TARGETS = tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
fax2ps.exe gif2tiff.exe pal2rgb.exe ppm2tiff.exe \
rgb2ycbcr.exe thumbnail.exe ras2tiff.exe raw2tiff.exe \
tiff2bw.exe tiff2rgba.exe tiff2pdf.exe tiff2ps.exe \
tiffcmp.exe tiffdither.exe tiffmedian.exe tiffsplit.exe
EXTRA_OBJ = strcasecmp.obj getopt.obj
INCL = -I..\libtiff
LIBS = $(LIBS) ..\libtiff\libtiff.lib
default: $(EXTRA_OBJ) $(TARGETS)
.c.exe:
$(CC) $(CFLAGS) $*.c $(EXTRA_OBJ) $(LIBS)
tiffgt.exe:
$(CC) $(CFLAGS) tiffgt.c $(EXTRA_OBJ) $(LIBS)
getopt.obj: ..\port\getopt.c
$(CC) /c $(CFLAGS) ..\port\getopt.c
strcasecmp.obj: ..\port\strcasecmp.c
$(CC) /c $(CFLAGS) ..\port\strcasecmp.c
clean:
-del *.exe *.obj

43
libtiff/Makefile.vc
View File

@ -5,36 +5,9 @@
# C:\libtiff\libtiff> nmake /f makefile.vc all
#
#
# Select _CONSOLE to build a library which reports errors to stderr, or
# _WINDOWED to build such that errors are reported via MessageBox().
#
WINMODE = -DTIF_PLATFORM_CONSOLE
#WINMODE = -DTIF_PLATFORM_WINDOWED
!INCLUDE ..\nmake.opt
# Uncomment and edit following lines to enable JPEG support
#JPEG_SUPPORT = 1
#JPEGDIR = d:/projects/jpeg-6b
#JPEG_LIB = $(JPEGDIR)/Release/jpeg.lib
# Uncomment and edit following lines to enable ZIP support
# (required for Deflate compression)
#ZIP_SUPPORT = 1
#ZLIBDIR = d:/projects/zlib-1.2.1
#ZLIB_LIB = $(ZLIBDIR)/zlib.lib
CC = cl
INCL = -I.
LIBS =
EXTRAFLAGS =
!IFDEF JPEG_SUPPORT
INCL = $(INCL) -I$(JPEGDIR)
LIBS = $(LIBS) $(JPEG_LIB)
EXTRAFLAGS = $(EXTRAFLAGS) -DJPEG_SUPPORT
!ENDIF
CFLAGS = /nologo /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS)
INCL = -I.
OBJ = \
tif_aux.obj \
@ -77,24 +50,22 @@ OBJ = \
VERSION = ..\VERSION
ALPHA = ..\dist\tiff.alpha
default: libtiff.lib
all: libtiff.lib libtiff.dll
libtiff.lib: tiffvers.h $(OBJ)
lib /out:libtiff.lib $(OBJ)
lib /nologo /out:libtiff.lib $(OBJ)
libtiff.dll: $(OBJ)
link /dll /def:libtiff.def /out:libtiff.dll /implib:libtiff_i.lib \
$(OBJ) $(LIBS)
link /nologo /dll /def:libtiff.def /out:libtiff.dll \
/implib:libtiff_i.lib $(OBJ) $(LIBS)
tiffvers.h: $(VERSION) mkversion.c
$(CC) mkversion.c
$(CC) $(CFLAGS) mkversion.c
if exist tiffvers.h del tiffvers.h
.\mkversion.exe -v $(VERSION) tiffvers.h
clean:
del *.obj *.lib libtiff.dll
-del *.obj *.lib *.dll *.exe
tif_version.obj: tiffvers.h

51
nmake.opt Normal file
View File

@ -0,0 +1,51 @@
# Compile time parameters for MS Visual C++ compiler.
# You may edit this file to specify building options.
#
# Select _CONSOLE to build a library which reports errors to stderr, or
# _WINDOWED to build such that errors are reported via MessageBox().
#
WINMODE = -DTIF_PLATFORM_CONSOLE
#WINMODE = -DTIF_PLATFORM_WINDOWED
#
# Uncomment and edit following lines to enable JPEG support.
#
#JPEG_SUPPORT = 1
#JPEGDIR = d:/projects/jpeg-6b
#JPEG_LIB = $(JPEGDIR)/Release/jpeg.lib
#
# Uncomment following lines to enable Old JPEG support
# (patched IJG JPEG library required, read the contrib\ojpeg\README first).
#
#OJPEG_SUPPORT = 1
#
# Uncomment and edit following lines to enable ZIP support
# (required for Deflate compression)
#
#ZIP_SUPPORT = 1
#ZLIBDIR = d:/projects/zlib-1.2.1
#ZLIB_LIB = $(ZLIBDIR)/zlib.lib
#
# There is nothing to edit below this line normally.
#
MAKE = nmake /nologo
CC = cl /nologo
CFLAGS = /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS)
EXTRAFLAGS =
LIBS =
!IFDEF JPEG_SUPPORT
LIBS = $(LIBS) $(JPEG_LIB)
EXTRAFLAGS = $(EXTRAFLAGS) -DJPEG_SUPPORT
!IFDEF OJPEG_SUPPORT
EXTRAFLAGS = $(EXTRAFLAGS) -DOJPEG_SUPPORT
!ENDIF
!ENDIF

24
tools/Makefile.vc
View File

@ -3,17 +3,8 @@
#
# To build:
# C:\libtiff\tools> nmake /f makefile.vc
#
# Uncomment and edit following lines to enable JPEG support
#JPEG_SUPPORT = 1
#JPEGDIR = d:/projects/jpeg-6b
#JPEG_LIB = $(JPEGDIR)/Release/jpeg.lib
# Uncomment and edit following lines to enable ZIP support
# (required for Deflate compression)
#ZIP_SUPPORT = 1
#ZLIBDIR = d:/projects/zlib-1.2.1
#ZLIB_LIB = $(ZLIBDIR)/zlib.lib
!INCLUDE ..\nmake.opt
TARGETS = tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
fax2ps.exe gif2tiff.exe pal2rgb.exe ppm2tiff.exe \
@ -23,15 +14,8 @@ TARGETS = tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
EXTRA_OBJ = strcasecmp.obj getopt.obj
LIBS = ..\libtiff\libtiff.lib
EXTRAFLAGS =
!IFDEF JPEG_SUPPORT
LIBS = $(LIBS) $(JPEG_LIB)
EXTRAFLAGS = $(EXTRAFLAGS) -DJPEG_SUPPORT
!ENDIF
CFLAGS = /nologo -I..\libtiff /D_WINDOWS $(EXTRAFLAGS)
INCL = -I..\libtiff
LIBS = $(LIBS) ..\libtiff\libtiff.lib
default: $(EXTRA_OBJ) $(TARGETS)
@ -48,4 +32,4 @@ strcasecmp.obj: ..\port\strcasecmp.c
$(CC) /c $(CFLAGS) ..\port\strcasecmp.c
clean:
del *.obj *.exe
-del *.exe *.obj