solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Avoid warnings in tif_print.c by excluding it from build

Browse source 
This is a rather drastic solution, but warnings given when
cross-compiling this file with MinGW are annoying, really fixing them is
not completely trivial and risks conflicting with the upstream changes
later, and we don't need the TIFFPrintDirectory() function defined in
this file anyhow, so just exclude it from the build.

Closes https://github.com/wxWidgets/wxWidgets/pull/2587
This commit is contained in:
Vadim Zeitlin 2021-11-16 02:35:03 +01:00
parent a7803a752d
commit d156058d41
6 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.in
View file

@ -244,7 +244,6 @@ WXTIFF_OBJECTS = \
wxtiff_tif_packbits.o \ wxtiff_tif_packbits.o \
wxtiff_tif_pixarlog.o \ wxtiff_tif_pixarlog.o \
wxtiff_tif_predict.o \ wxtiff_tif_predict.o \
wxtiff_tif_print.o \
wxtiff_tif_read.o \ wxtiff_tif_read.o \
wxtiff_tif_strip.o \ wxtiff_tif_strip.o \
wxtiff_tif_swab.o \ wxtiff_tif_swab.o \
@ -15318,9 +15317,6 @@ wxtiff_tif_pixarlog.o: $(srcdir)/src/tiff/libtiff/tif_pixarlog.c
wxtiff_tif_predict.o: $(srcdir)/src/tiff/libtiff/tif_predict.c wxtiff_tif_predict.o: $(srcdir)/src/tiff/libtiff/tif_predict.c
$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_predict.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_predict.c
wxtiff_tif_print.o: $(srcdir)/src/tiff/libtiff/tif_print.c
$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_print.c
wxtiff_tif_read.o: $(srcdir)/src/tiff/libtiff/tif_read.c wxtiff_tif_read.o: $(srcdir)/src/tiff/libtiff/tif_read.c
$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_read.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_read.c

7
build/bakefiles/tiff.bkl
View file

@ -85,7 +85,14 @@
src/tiff/libtiff/tif_packbits.c src/tiff/libtiff/tif_packbits.c
src/tiff/libtiff/tif_pixarlog.c src/tiff/libtiff/tif_pixarlog.c
src/tiff/libtiff/tif_predict.c src/tiff/libtiff/tif_predict.c
<!--
Exclude this file because it contains only TIFFPrintDirectory()
function that we never use, but compiling which generates tons
of warnings when using MinGW (e.g. when cross-compiling) and it
seems simpler to just not compile it at all than to fix them.
src/tiff/libtiff/tif_print.c src/tiff/libtiff/tif_print.c
-->
src/tiff/libtiff/tif_read.c src/tiff/libtiff/tif_read.c
src/tiff/libtiff/tif_strip.c src/tiff/libtiff/tif_strip.c
src/tiff/libtiff/tif_swab.c src/tiff/libtiff/tif_swab.c

4
build/msw/makefile.gcc
View file

@ -198,7 +198,6 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_packbits.o \ $(OBJS)\wxtiff_tif_packbits.o \
$(OBJS)\wxtiff_tif_pixarlog.o \ $(OBJS)\wxtiff_tif_pixarlog.o \
$(OBJS)\wxtiff_tif_predict.o \ $(OBJS)\wxtiff_tif_predict.o \
$(OBJS)\wxtiff_tif_print.o \
$(OBJS)\wxtiff_tif_read.o \ $(OBJS)\wxtiff_tif_read.o \
$(OBJS)\wxtiff_tif_strip.o \ $(OBJS)\wxtiff_tif_strip.o \
$(OBJS)\wxtiff_tif_swab.o \ $(OBJS)\wxtiff_tif_swab.o \
@ -6442,9 +6441,6 @@ $(OBJS)\wxtiff_tif_pixarlog.o: ../../src/tiff/libtiff/tif_pixarlog.c
$(OBJS)\wxtiff_tif_predict.o: ../../src/tiff/libtiff/tif_predict.c $(OBJS)\wxtiff_tif_predict.o: ../../src/tiff/libtiff/tif_predict.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_print.o: ../../src/tiff/libtiff/tif_print.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_read.o: ../../src/tiff/libtiff/tif_read.c $(OBJS)\wxtiff_tif_read.o: ../../src/tiff/libtiff/tif_read.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<

4
build/msw/makefile.vc
View file

@ -215,7 +215,6 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_packbits.obj \ $(OBJS)\wxtiff_tif_packbits.obj \
$(OBJS)\wxtiff_tif_pixarlog.obj \ $(OBJS)\wxtiff_tif_pixarlog.obj \
$(OBJS)\wxtiff_tif_predict.obj \ $(OBJS)\wxtiff_tif_predict.obj \
$(OBJS)\wxtiff_tif_print.obj \
$(OBJS)\wxtiff_tif_read.obj \ $(OBJS)\wxtiff_tif_read.obj \
$(OBJS)\wxtiff_tif_strip.obj \ $(OBJS)\wxtiff_tif_strip.obj \
$(OBJS)\wxtiff_tif_swab.obj \ $(OBJS)\wxtiff_tif_swab.obj \
@ -6873,9 +6872,6 @@ $(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\libtiff\tif_pixarlog.c
$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\libtiff\tif_predict.c $(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\libtiff\tif_predict.c
$(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_predict.c $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_predict.c
$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\libtiff\tif_print.c
$(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_print.c
$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\libtiff\tif_read.c $(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\libtiff\tif_read.c
$(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_read.c $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_read.c

4
build/msw/wx_vc8_wxtiff.vcproj
View file

@ -782,10 +782,6 @@
RelativePath="..\..\src\tiff\libtiff\tif_predict.c" RelativePath="..\..\src\tiff\libtiff\tif_predict.c"
> >
</File> </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_print.c"
>
</File>
<File <File
RelativePath="..\..\src\tiff\libtiff\tif_read.c" RelativePath="..\..\src\tiff\libtiff\tif_read.c"
> >

4
build/msw/wx_vc9_wxtiff.vcproj
View file

@ -778,10 +778,6 @@
RelativePath="..\..\src\tiff\libtiff\tif_predict.c" RelativePath="..\..\src\tiff\libtiff\tif_predict.c"
> >
</File> </File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_print.c"
>
</File>
<File <File
RelativePath="..\..\src\tiff\libtiff\tif_read.c" RelativePath="..\..\src\tiff\libtiff\tif_read.c"
> >