From 1948edf1fe89dd2a7978ab873241842559c98405 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 23 Mar 2021 15:37:18 +0100 Subject: [PATCH] Clean up and get ready for testing on all platforms --- deps/deps-linux.cmake | 94 +---------------- deps/deps-mingw.cmake | 54 ---------- deps/deps-unix-common.cmake | 77 -------------- deps/deps-windows.cmake | 179 --------------------------------- deps/wxWidgets/wxWidgets.cmake | 2 +- deps/wxwidgets-pngprefix.h | 168 ------------------------------- 6 files changed, 2 insertions(+), 572 deletions(-) delete mode 100644 deps/wxwidgets-pngprefix.h diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake index 852fe1887..fbe7b711b 100644 --- a/deps/deps-linux.cmake +++ b/deps/deps-linux.cmake @@ -7,96 +7,4 @@ include("deps-unix-common.cmake") # find_package(PNG QUIET) # if (NOT PNG_FOUND) # message(WARNING "No PNG dev package found in system, building static library. You should install the system package.") -# endif () - -#TODO UDEV - -# ExternalProject_Add(dep_boost -# EXCLUDE_FROM_ALL 1 -# URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz" -# URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a -# BUILD_IN_SOURCE 1 -# CONFIGURE_COMMAND ./bootstrap.sh -# --with-libraries=system,iostreams,filesystem,thread,log,locale,regex,date_time -# "--prefix=${DESTDIR}/usr/local" -# BUILD_COMMAND ./b2 -# -j ${NPROC} -# --reconfigure -# link=static -# variant=release -# threading=multi -# boost.locale.icu=off -# --disable-icu -# cflags=-fPIC -# cxxflags=-fPIC -# install -# INSTALL_COMMAND "" # b2 does that already -# ) - -# ExternalProject_Add(dep_libopenssl -# EXCLUDE_FROM_ALL 1 -# URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_0l.tar.gz" -# URL_HASH SHA256=e2acf0cf58d9bff2b42f2dc0aee79340c8ffe2c5e45d3ca4533dd5d4f5775b1d -# BUILD_IN_SOURCE 1 -# CONFIGURE_COMMAND ./config -# "--prefix=${DESTDIR}/usr/local" -# "--libdir=lib" -# no-shared -# no-ssl3-method -# no-dynamic-engine -# -Wa,--noexecstack -# BUILD_COMMAND make depend && make "-j${NPROC}" -# INSTALL_COMMAND make install_sw -# ) - -# ExternalProject_Add(dep_libcurl -# EXCLUDE_FROM_ALL 1 -# DEPENDS dep_libopenssl -# URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz" -# URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115 -# BUILD_IN_SOURCE 1 -# CONFIGURE_COMMAND ./configure -# --enable-static -# --disable-shared -# "--with-ssl=${DESTDIR}/usr/local" -# --with-pic -# --enable-ipv6 -# --enable-versioned-symbols -# --enable-threaded-resolver -# --with-random=/dev/urandom - -# # CA root certificate paths will be set for openssl at runtime. -# --without-ca-bundle -# --without-ca-path -# --with-ca-fallback # to look for the ssl backend's ca store - -# --disable-ldap -# --disable-ldaps -# --disable-manual -# --disable-rtsp -# --disable-dict -# --disable-telnet -# --disable-pop3 -# --disable-imap -# --disable-smb -# --disable-smtp -# --disable-gopher -# --without-gssapi -# --without-libpsl -# --without-libidn2 -# --without-gnutls -# --without-polarssl -# --without-mbedtls -# --without-cyassl -# --without-nss -# --without-axtls -# --without-brotli -# --without-libmetalink -# --without-libssh -# --without-libssh2 -# --without-librtmp -# --without-nghttp2 -# --without-zsh-functions-dir -# BUILD_COMMAND make "-j${NPROC}" -# INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" -# ) +# endif () \ No newline at end of file diff --git a/deps/deps-mingw.cmake b/deps/deps-mingw.cmake index cae7fc371..b86554f64 100644 --- a/deps/deps-mingw.cmake +++ b/deps/deps-mingw.cmake @@ -6,57 +6,3 @@ find_package(Git REQUIRED) # TODO make sure to build tbb with -flifetime-dse=1 include("deps-unix-common.cmake") - -ExternalProject_Add(dep_boost - EXCLUDE_FROM_ALL 1 - URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz" - URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND bootstrap.bat - BUILD_COMMAND b2.exe - -j "${NPROC}" - --with-system - --with-filesystem - --with-thread - --with-log - --with-locale - --with-regex - --with-date_time - "--prefix=${DESTDIR}/usr/local" - "address-model=${DEPS_BITS}" - "toolset=${DEP_BOOST_TOOLSET}" - link=static - define=BOOST_USE_WINAPI_VERSION=0x0502 - variant=release - threading=multi - boost.locale.icu=off - "${DEP_BOOST_DEBUG}" release install - INSTALL_COMMAND "" # b2 does that already -) - -ExternalProject_Add(dep_libcurl - EXCLUDE_FROM_ALL 1 - URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz" - URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115 - CMAKE_ARGS - -DBUILD_SHARED_LIBS=OFF - -DBUILD_TESTING=OFF - -DCURL_STATICLIB=ON - -DCURL_STATIC_CRT=ON - -DENABLE_THREADED_RESOLVER=ON - -DCURL_DISABLE_FTP=ON - -DCURL_DISABLE_LDAP=ON - -DCURL_DISABLE_LDAPS=ON - -DCURL_DISABLE_TELNET=ON - -DCURL_DISABLE_DICT=ON - -DCURL_DISABLE_FILE=ON - -DCURL_DISABLE_TFTP=ON - -DCURL_DISABLE_RTSP=ON - -DCURL_DISABLE_POP3=ON - -DCURL_DISABLE_IMAP=ON - -DCURL_DISABLE_SMTP=ON - -DCURL_DISABLE_GOPHER=ON - -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local - ${DEP_CMAKE_OPTS} -) - diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index 0b36dbcc2..d715e81a1 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -17,80 +17,3 @@ endif () # if (NOT EXPAT_FOUND) # message(WARNING "No EXPAT dev package found in system, building static library. Consider installing the system package.") # endif () - -# ExternalProject_Add(dep_cereal -# EXCLUDE_FROM_ALL 1 -# URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz" -# # URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae -# CMAKE_ARGS -# -DJUST_INSTALL_CEREAL=on -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# ${DEP_CMAKE_OPTS} -# ) - -# ExternalProject_Add(dep_qhull -# EXCLUDE_FROM_ALL 1 -# #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz" -# #URL_HASH SHA256=619c8a954880d545194bc03359404ef36a1abd2dde03678089459757fd790cb0 -# GIT_REPOSITORY https://github.com/qhull/qhull.git -# GIT_TAG 7afedcc73666e46a9f1d74632412ebecf53b1b30 # v7.3.2 plus the mac build patch -# CMAKE_ARGS -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# ${DEP_CMAKE_OPTS} -# ) - -# ExternalProject_Add(dep_blosc -# EXCLUDE_FROM_ALL 1 -# GIT_REPOSITORY https://github.com/Blosc/c-blosc.git -# GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0 -# DEPENDS -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DCMAKE_DEBUG_POSTFIX=d -# -DBUILD_SHARED=OFF -# -DBUILD_STATIC=ON -# -DBUILD_TESTS=OFF -# -DBUILD_BENCHMARKS=OFF -# -DPREFER_EXTERNAL_ZLIB=ON -# PATCH_COMMAND ${GIT_EXECUTABLE} reset --hard && git clean -df && -# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch -# ) - -# ExternalProject_Add(dep_openexr -# EXCLUDE_FROM_ALL 1 -# GIT_REPOSITORY https://github.com/openexr/openexr.git -# GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0 -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DBUILD_TESTING=OFF -# -DPYILMBASE_ENABLE:BOOL=OFF -# -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF -# -DOPENEXR_BUILD_UTILS:BOOL=OFF -# ) - -# ExternalProject_Add(dep_openvdb -# EXCLUDE_FROM_ALL 1 -# GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git -# GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1 -# DEPENDS dep_blosc dep_openexr -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DCMAKE_DEBUG_POSTFIX=d -# -DCMAKE_PREFIX_PATH=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DOPENVDB_BUILD_PYTHON_MODULE=OFF -# -DUSE_BLOSC=ON -# -DOPENVDB_CORE_SHARED=OFF -# -DOPENVDB_CORE_STATIC=ON -# -DTBB_STATIC=ON -# -DOPENVDB_BUILD_VDB_PRINT=ON -# -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON -# PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df && -# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/openvdb-mods.patch -# ) diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 085b19e1c..7288cfe6f 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -53,99 +53,6 @@ if (${DEP_DEBUG}) endif () endmacro() -# ExternalProject_Add(dep_boost -# EXCLUDE_FROM_ALL 1 -# URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz" -# URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a -# BUILD_IN_SOURCE 1 -# CONFIGURE_COMMAND bootstrap.bat -# BUILD_COMMAND b2.exe -# -j "${NPROC}" -# --with-system -# --with-iostreams -# --with-filesystem -# --with-thread -# --with-log -# --with-locale -# --with-regex -# --with-date_time -# "--prefix=${DESTDIR}/usr/local" -# "address-model=${DEPS_BITS}" -# "toolset=${DEP_BOOST_TOOLSET}" -# link=static -# variant=release -# threading=multi -# boost.locale.icu=off -# --disable-icu -# "${DEP_BOOST_DEBUG}" release install -# INSTALL_COMMAND "" # b2 does that already -# ) - -# ExternalProject_Add(dep_cereal -# EXCLUDE_FROM_ALL 1 -# URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz" -# # URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae -# CMAKE_GENERATOR "${DEP_MSVC_GEN}" -# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" -# CMAKE_ARGS -# -DJUST_INSTALL_CEREAL=on -# "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local" -# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj -# INSTALL_COMMAND "" -# ) - -# if (${DEPS_BITS} EQUAL 32) -# set(DEP_LIBCURL_TARGET "x86") -# else () -# set(DEP_LIBCURL_TARGET "x64") -# endif () - -# ExternalProject_Add(dep_libcurl -# EXCLUDE_FROM_ALL 1 -# URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz" -# URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115 -# BUILD_IN_SOURCE 1 -# CONFIGURE_COMMAND "" -# BUILD_COMMAND cd winbuild && nmake /f Makefile.vc mode=static "VC=${DEP_VS_VER}" GEN_PDB=yes DEBUG=no "MACHINE=${DEP_LIBCURL_TARGET}" -# INSTALL_COMMAND cd builds\\libcurl-*-release-*-winssl -# && "${CMAKE_COMMAND}" -E copy_directory include "${DESTDIR}\\usr\\local\\include" -# && "${CMAKE_COMMAND}" -E copy_directory lib "${DESTDIR}\\usr\\local\\lib" -# ) -# if (${DEP_DEBUG}) -# ExternalProject_Get_Property(dep_libcurl SOURCE_DIR) -# ExternalProject_Add_Step(dep_libcurl build_debug -# DEPENDEES build -# DEPENDERS install -# COMMAND cd winbuild && nmake /f Makefile.vc mode=static "VC=${DEP_VS_VER}" GEN_PDB=yes DEBUG=yes "MACHINE=${DEP_LIBCURL_TARGET}" -# WORKING_DIRECTORY "${SOURCE_DIR}" -# ) -# ExternalProject_Add_Step(dep_libcurl install_debug -# DEPENDEES install -# COMMAND cd builds\\libcurl-*-debug-*-winssl -# && "${CMAKE_COMMAND}" -E copy_directory include "${DESTDIR}\\usr\\local\\include" -# && "${CMAKE_COMMAND}" -E copy_directory lib "${DESTDIR}\\usr\\local\\lib" -# WORKING_DIRECTORY "${SOURCE_DIR}" -# ) -# endif () - -# ExternalProject_Add(dep_qhull -# EXCLUDE_FROM_ALL 1 -# #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz" -# #URL_HASH SHA256=619c8a954880d545194bc03359404ef36a1abd2dde03678089459757fd790cb0 -# GIT_REPOSITORY https://github.com/qhull/qhull.git -# GIT_TAG 7afedcc73666e46a9f1d74632412ebecf53b1b30 # v7.3.2 plus the mac build patch -# CMAKE_GENERATOR "${DEP_MSVC_GEN}" -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DCMAKE_DEBUG_POSTFIX=d -# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj -# INSTALL_COMMAND "" -# ) - -# add_debug_dep(dep_qhull) - if (${DEPS_BITS} EQUAL 32) set(DEP_WXWIDGETS_TARGET "") set(DEP_WXWIDGETS_LIBDIR "vc_lib") @@ -155,89 +62,3 @@ else () endif () find_package(Git REQUIRED) - -# ExternalProject_Add(dep_blosc -# EXCLUDE_FROM_ALL 1 -# #URL https://github.com/Blosc/c-blosc/archive/v1.17.0.zip -# #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9 -# GIT_REPOSITORY https://github.com/Blosc/c-blosc.git -# GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0 -# CMAKE_GENERATOR "${DEP_MSVC_GEN}" -# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DCMAKE_DEBUG_POSTFIX=d -# -DBUILD_SHARED=OFF -# -DBUILD_STATIC=ON -# -DBUILD_TESTS=OFF -# -DBUILD_BENCHMARKS=OFF -# -DPREFER_EXTERNAL_ZLIB=ON -# -DBLOSC_IS_SUBPROJECT:BOOL=ON -# -DBLOSC_INSTALL:BOOL=ON -# PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df && -# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch -# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj -# INSTALL_COMMAND "" -# ) - -# add_debug_dep(dep_blosc) - -# ExternalProject_Add(dep_openexr -# EXCLUDE_FROM_ALL 1 -# GIT_REPOSITORY https://github.com/openexr/openexr.git -# GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0 -# CMAKE_GENERATOR "${DEP_MSVC_GEN}" -# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DBUILD_TESTING=OFF -# -DPYILMBASE_ENABLE:BOOL=OFF -# -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF -# -DOPENEXR_BUILD_UTILS:BOOL=OFF -# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj -# INSTALL_COMMAND "" -# ) - -# add_debug_dep(dep_openexr) - -# ExternalProject_Add(dep_openvdb -# EXCLUDE_FROM_ALL 1 -# #URL https://github.com/AcademySoftwareFoundation/openvdb/archive/v6.2.1.zip -# #URL_HASH SHA256=dc337399dce8e1c9f21f20e97b1ce7e4933cb0a63bb3b8b734d8fcc464aa0c48 -# GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git -# GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1 -# DEPENDS dep_blosc dep_openexr dep_tbb dep_boost -# CMAKE_GENERATOR "${DEP_MSVC_GEN}" -# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" -# CMAKE_ARGS -# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -# -DCMAKE_DEBUG_POSTFIX=d -# -DCMAKE_PREFIX_PATH=${DESTDIR}/usr/local -# -DBUILD_SHARED_LIBS=OFF -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DOPENVDB_BUILD_PYTHON_MODULE=OFF -# -DUSE_BLOSC=ON -# -DOPENVDB_CORE_SHARED=OFF -# -DOPENVDB_CORE_STATIC=ON -# -DTBB_STATIC=ON -# -DOPENVDB_BUILD_VDB_PRINT=ON -# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj -# PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df && -# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/openvdb-mods.patch -# INSTALL_COMMAND "" -# ) - -# if (${DEP_DEBUG}) -# ExternalProject_Get_Property(dep_openvdb BINARY_DIR) -# ExternalProject_Add_Step(dep_openvdb build_debug -# DEPENDEES build -# DEPENDERS install -# COMMAND ${CMAKE_COMMAND} ../dep_openvdb -DOPENVDB_BUILD_VDB_PRINT=OFF -# COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj -# WORKING_DIRECTORY "${BINARY_DIR}" -# ) -# endif () \ No newline at end of file diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 42643f37d..a060faedc 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -11,7 +11,7 @@ endif() prusaslicer_add_cmake_project(wxWidgets GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets" - GIT_TAG ${_wx_git_tag} + GIT_TAG tm_cross_compile #${_wx_git_tag} DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} CMAKE_ARGS -DwxBUILD_PRECOMP=ON diff --git a/deps/wxwidgets-pngprefix.h b/deps/wxwidgets-pngprefix.h deleted file mode 100644 index 67c70af80..000000000 --- a/deps/wxwidgets-pngprefix.h +++ /dev/null @@ -1,168 +0,0 @@ -// Patched in PrusaSlicer: These two were missing: -#define png_write_eXIf wx_png_write_eXIf -#define png_handle_eXIf wx_png_handle_eXIf - -#define png_sRGB_table wx_png_sRGB_table -#define png_sRGB_base wx_png_sRGB_base -#define png_sRGB_delta wx_png_sRGB_delta -#define png_zstream_error wx_png_zstream_error -#define png_free_buffer_list wx_png_free_buffer_list -#define png_fixed wx_png_fixed -#define png_user_version_check wx_png_user_version_check -#define png_malloc_base wx_png_malloc_base -#define png_malloc_array wx_png_malloc_array -#define png_realloc_array wx_png_realloc_array -#define png_create_png_struct wx_png_create_png_struct -#define png_destroy_png_struct wx_png_destroy_png_struct -#define png_free_jmpbuf wx_png_free_jmpbuf -#define png_zalloc wx_png_zalloc -#define png_zfree wx_png_zfree -#define png_default_read_data wx_png_default_read_data -#define png_push_fill_buffer wx_png_push_fill_buffer -#define png_default_write_data wx_png_default_write_data -#define png_default_flush wx_png_default_flush -#define png_reset_crc wx_png_reset_crc -#define png_write_data wx_png_write_data -#define png_read_sig wx_png_read_sig -#define png_read_chunk_header wx_png_read_chunk_header -#define png_read_data wx_png_read_data -#define png_crc_read wx_png_crc_read -#define png_crc_finish wx_png_crc_finish -#define png_crc_error wx_png_crc_error -#define png_calculate_crc wx_png_calculate_crc -#define png_flush wx_png_flush -#define png_write_IHDR wx_png_write_IHDR -#define png_write_PLTE wx_png_write_PLTE -#define png_compress_IDAT wx_png_compress_IDAT -#define png_write_IEND wx_png_write_IEND -#define png_write_gAMA_fixed wx_png_write_gAMA_fixed -#define png_write_sBIT wx_png_write_sBIT -#define png_write_cHRM_fixed wx_png_write_cHRM_fixed -#define png_write_sRGB wx_png_write_sRGB -#define png_write_iCCP wx_png_write_iCCP -#define png_write_sPLT wx_png_write_sPLT -#define png_write_tRNS wx_png_write_tRNS -#define png_write_bKGD wx_png_write_bKGD -#define png_write_hIST wx_png_write_hIST -#define png_write_tEXt wx_png_write_tEXt -#define png_write_zTXt wx_png_write_zTXt -#define png_write_iTXt wx_png_write_iTXt -#define png_set_text_2 wx_png_set_text_2 -#define png_write_oFFs wx_png_write_oFFs -#define png_write_pCAL wx_png_write_pCAL -#define png_write_pHYs wx_png_write_pHYs -#define png_write_tIME wx_png_write_tIME -#define png_write_sCAL_s wx_png_write_sCAL_s -#define png_write_finish_row wx_png_write_finish_row -#define png_write_start_row wx_png_write_start_row -#define png_combine_row wx_png_combine_row -#define png_do_read_interlace wx_png_do_read_interlace -#define png_do_write_interlace wx_png_do_write_interlace -#define png_read_filter_row wx_png_read_filter_row -#define png_write_find_filter wx_png_write_find_filter -#define png_read_IDAT_data wx_png_read_IDAT_data -#define png_read_finish_IDAT wx_png_read_finish_IDAT -#define png_read_finish_row wx_png_read_finish_row -#define png_read_start_row wx_png_read_start_row -#define png_zlib_inflate wx_png_zlib_inflate -#define png_read_transform_info wx_png_read_transform_info -#define png_do_strip_channel wx_png_do_strip_channel -#define png_do_swap wx_png_do_swap -#define png_do_packswap wx_png_do_packswap -#define png_do_invert wx_png_do_invert -#define png_do_bgr wx_png_do_bgr -#define png_handle_IHDR wx_png_handle_IHDR -#define png_handle_PLTE wx_png_handle_PLTE -#define png_handle_IEND wx_png_handle_IEND -#define png_handle_bKGD wx_png_handle_bKGD -#define png_handle_cHRM wx_png_handle_cHRM -#define png_handle_gAMA wx_png_handle_gAMA -#define png_handle_hIST wx_png_handle_hIST -#define png_handle_iCCP wx_png_handle_iCCP -#define png_handle_iTXt wx_png_handle_iTXt -#define png_handle_oFFs wx_png_handle_oFFs -#define png_handle_pCAL wx_png_handle_pCAL -#define png_handle_pHYs wx_png_handle_pHYs -#define png_handle_sBIT wx_png_handle_sBIT -#define png_handle_sCAL wx_png_handle_sCAL -#define png_handle_sPLT wx_png_handle_sPLT -#define png_handle_sRGB wx_png_handle_sRGB -#define png_handle_tEXt wx_png_handle_tEXt -#define png_handle_tIME wx_png_handle_tIME -#define png_handle_tRNS wx_png_handle_tRNS -#define png_handle_zTXt wx_png_handle_zTXt -#define png_check_chunk_name wx_png_check_chunk_name -#define png_check_chunk_length wx_png_check_chunk_length -#define png_handle_unknown wx_png_handle_unknown -#define png_chunk_unknown_handling wx_png_chunk_unknown_handling -#define png_do_read_transformations wx_png_do_read_transformations -#define png_do_write_transformations wx_png_do_write_transformations -#define png_init_read_transformations wx_png_init_read_transformations -#define png_push_read_chunk wx_png_push_read_chunk -#define png_push_read_sig wx_png_push_read_sig -#define png_push_check_crc wx_png_push_check_crc -#define png_push_save_buffer wx_png_push_save_buffer -#define png_push_restore_buffer wx_png_push_restore_buffer -#define png_push_read_IDAT wx_png_push_read_IDAT -#define png_process_IDAT_data wx_png_process_IDAT_data -#define png_push_process_row wx_png_push_process_row -#define png_push_handle_unknown wx_png_push_handle_unknown -#define png_push_have_info wx_png_push_have_info -#define png_push_have_end wx_png_push_have_end -#define png_push_have_row wx_png_push_have_row -#define png_push_read_end wx_png_push_read_end -#define png_process_some_data wx_png_process_some_data -#define png_read_push_finish_row wx_png_read_push_finish_row -#define png_push_handle_tEXt wx_png_push_handle_tEXt -#define png_push_read_tEXt wx_png_push_read_tEXt -#define png_push_handle_zTXt wx_png_push_handle_zTXt -#define png_push_read_zTXt wx_png_push_read_zTXt -#define png_push_handle_iTXt wx_png_push_handle_iTXt -#define png_push_read_iTXt wx_png_push_read_iTXt -#define png_colorspace_set_gamma wx_png_colorspace_set_gamma -#define png_colorspace_sync_info wx_png_colorspace_sync_info -#define png_colorspace_sync wx_png_colorspace_sync -#define png_colorspace_set_chromaticities wx_png_colorspace_set_chromaticities -#define png_colorspace_set_endpoints wx_png_colorspace_set_endpoints -#define png_colorspace_set_sRGB wx_png_colorspace_set_sRGB -#define png_colorspace_set_ICC wx_png_colorspace_set_ICC -#define png_icc_check_length wx_png_icc_check_length -#define png_icc_check_header wx_png_icc_check_header -#define png_icc_check_tag_table wx_png_icc_check_tag_table -#define png_icc_set_sRGB wx_png_icc_set_sRGB -#define png_colorspace_set_rgb_coefficients wx_png_colorspace_set_rgb_coefficients -#define png_check_IHDR wx_png_check_IHDR -#define png_do_check_palette_indexes wx_png_do_check_palette_indexes -#define png_fixed_error wx_png_fixed_error -#define png_safecat wx_png_safecat -#define png_format_number wx_png_format_number -#define png_warning_parameter wx_png_warning_parameter -#define png_warning_parameter_unsigned wx_png_warning_parameter_unsigned -#define png_warning_parameter_signed wx_png_warning_parameter_signed -#define png_formatted_warning wx_png_formatted_warning -#define png_app_warning wx_png_app_warning -#define png_app_error wx_png_app_error -#define png_chunk_report wx_png_chunk_report -#define png_ascii_from_fp wx_png_ascii_from_fp -#define png_ascii_from_fixed wx_png_ascii_from_fixed -#define png_check_fp_number wx_png_check_fp_number -#define png_check_fp_string wx_png_check_fp_string -#define png_muldiv wx_png_muldiv -#define png_muldiv_warn wx_png_muldiv_warn -#define png_reciprocal wx_png_reciprocal -#define png_reciprocal2 wx_png_reciprocal2 -#define png_gamma_significant wx_png_gamma_significant -#define png_gamma_correct wx_png_gamma_correct -#define png_gamma_16bit_correct wx_png_gamma_16bit_correct -#define png_gamma_8bit_correct wx_png_gamma_8bit_correct -#define png_destroy_gamma_table wx_png_destroy_gamma_table -#define png_build_gamma_table wx_png_build_gamma_table -#define png_safe_error wx_png_safe_error -#define png_safe_warning wx_png_safe_warning -#define png_safe_execute wx_png_safe_execute -#define png_image_error wx_png_image_error -#define png_check_keyword wx_png_check_keyword - - - -