Upgrade libpng to 1.6.34
Upgrade src/png submodule to the latest library version and slightly update its upgrade instructions.
This commit is contained in:
@@ -116,11 +116,12 @@ to perform an extra step after merging the new version (and before committing
|
|||||||
your changes):
|
your changes):
|
||||||
|
|
||||||
Create a temporary build directory and run libpng configure from it using
|
Create a temporary build directory and run libpng configure from it using
|
||||||
--with-libpng-prefix=wx_ option. Then run "make" (actually just "make png.lo"
|
--with-libpng-prefix=wx_ option. Then run `make pnglibconf.h pngprefix.h`
|
||||||
is sufficient as we don't really need to build the library) to create
|
to create these files in the build directory. Next, search for the line
|
||||||
pnglibconf.h and pngprefix.h files in the build directory. And copy these
|
containing `PNG_ZLIB_VERNUM` in the `pnglibconf.h` and set it to 0 to disable
|
||||||
files to src/png subdirectory of the wxWidgets source tree, overwriting the
|
zlib version checks (this looks dangerous but seems to be unavoidable with the
|
||||||
versions there.
|
current build system). And then, finally, copy these files to src/png
|
||||||
|
subdirectory of the wxWidgets source tree, overwriting the versions there.
|
||||||
|
|
||||||
Notice that config.h generated by libpng configure is not used, we build it
|
Notice that config.h generated by libpng configure is not used, we build it
|
||||||
without -DHAVE_CONFIG_H as it works just fine without it on any ANSI C system
|
without -DHAVE_CONFIG_H as it works just fine without it on any ANSI C system
|
||||||
|
2
src/png
2
src/png
Submodule src/png updated: 834401fec4...8129d71d80
Reference in New Issue
Block a user