Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tiff submodule

Browse Source 
Add the new files to the build system. Disable support for webp and zstd
because we do not want to depend on external libraries.
This commit is contained in:
Maarten Bent
2018-11-17 15:27:31 +01:00
parent 9b8ed6a021
commit ec4b71afa0
12 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/msw/makefile.gcc
View File

@@ -174,8 +174,10 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_tile.o \
$(OBJS)\wxtiff_tif_version.o \
$(OBJS)\wxtiff_tif_warning.o \
$(OBJS)\wxtiff_tif_webp.o \
$(OBJS)\wxtiff_tif_write.o \
$(OBJS)\wxtiff_tif_zip.o
$(OBJS)\wxtiff_tif_zip.o \
$(OBJS)\wxtiff_tif_zstd.o
WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -DNDEBUG -I$(LIBDIRNAME) $(CPPFLAGS) $(CFLAGS)
WXEXPAT_OBJECTS = \
@@ -6132,12 +6134,18 @@ $(OBJS)\wxtiff_tif_version.o: ../../src/tiff/libtiff/tif_version.c
$(OBJS)\wxtiff_tif_warning.o: ../../src/tiff/libtiff/tif_warning.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_webp.o: ../../src/tiff/libtiff/tif_webp.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_write.o: ../../src/tiff/libtiff/tif_write.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_zip.o: ../../src/tiff/libtiff/tif_zip.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_zstd.o: ../../src/tiff/libtiff/tif_zstd.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxexpat_xmlparse.o: ../../src/expat/expat/lib/xmlparse.c
$(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $<