m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build with libtiff 3.9.6

Browse Source
This commit is contained in:
Thomas Bernard 2019-07-24 03:38:39 +02:00
parent f28a6cb9a3
commit 7f4e1a10eb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -681,7 +681,8 @@ endif
COPT += -DNO_X11 COPT += -DNO_X11
endif endif
LOPT += $(TTFLOPT) LOPT += $(TTFLOPT)
LOPT += $(shell $(PKG_CONFIG) --libs libpng libtiff-4) LOPT += $(shell $(PKG_CONFIG) --libs libpng `$(PKG_CONFIG) --exists libtiff-4 && echo libtiff-4`)
LOPT += $(shell $(PKG_CONFIG) --exists libtiff-4 || echo -ltiff)
LOPT += $(LUALOPT) LOPT += $(LUALOPT)
OBJDIR = ../obj/unix OBJDIR = ../obj/unix
FCLOPT = -lfontconfig FCLOPT = -lfontconfig

2
src/tifformat.c
View File

@ -435,7 +435,7 @@ void Load_TIFF_Sub(T_IO_Context * context, TIFF * tif, unsigned long file_size)
for (;;) for (;;)
{ {
word subifd_count; word subifd_count;
#if TIFFLIB_VERSION < 20120101 #if TIFFLIB_VERSION <= 20120218
uint32 * subifd_array; uint32 * subifd_array;
#else #else
uint64 * subifd_array; uint64 * subifd_array;