From 22d5a14fd08e6c9dc44652e73792857bb2106995 Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Thu, 11 Jan 2018 20:06:35 +0500 Subject: [PATCH 1/3] Update CMake scripts --- cmake/CMakeLists.txt | 66 ++++++++++++++++++++--- cmake/common.rc | 7 +++ cmake/expat/CMakeLists.txt | 11 +++- cmake/expat/expat_config.h.cmake | 91 ++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 10 deletions(-) create mode 100644 cmake/common.rc create mode 100644 cmake/expat/expat_config.h.cmake diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 35703618..fbf83d14 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -14,6 +14,8 @@ endif() cmake_policy(SET CMP0022 NEW) +find_package(Gettext REQUIRED) + get_filename_component(ROOT_DIR ${CMAKE_SOURCE_DIR}/.. REALPATH) # Parse version header to always have actual version of winsparkle @@ -35,7 +37,7 @@ set(INCLUDE_INSTALL_DIR "include") set(CONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") set(CMAKE_DEBUG_POSTFIX "d") -set(EXPAT_INCLUDE_DIRS "${ROOT_DIR}/3rdparty/expat/lib") +set(EXPAT_INCLUDE_DIRS "${ROOT_DIR}/3rdparty/expat/expat/lib") # bundled expat add_subdirectory(expat) @@ -76,15 +78,63 @@ set(PUBLIC_HEADERS ${ROOT_DIR}/include/winsparkle.h ${ROOT_DIR}/include/winsparkle-version.h) -set(RESOURCES winsparkle translations) - -# resource compilation for MinGW -foreach(RESOURCE ${RESOURCES}) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE}.o - COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE}.rc - -o ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE}.o) +set(LANGUAGES + ar + be + bg + bs + ca_ES + co + cs + da + de + el + es + eu + fr + fy_NL + ga + he + hr + hu + hy + id + it + ja + kk + ko + nb + nl + pl + pt_BR + pt_PT + ru + sk + sr + sv + tr + uk + zh_CN + zh_TW +) + +foreach(LANG ${LANGUAGES}) + add_custom_command(OUTPUT ${LANG}.mo + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c -o ${LANG}.mo ${ROOT_DIR}/translations/${LANG}.po + DEPENDS ${ROOT_DIR}/translations/${LANG}.po + ) + + list(APPEND MO_FILES ${LANG}.mo) endforeach() +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/common_res.o + COMMAND ${CMAKE_RC_COMPILER} -O coff -I${ROOT_DIR}/include -i ${CMAKE_CURRENT_SOURCE_DIR}/common.rc + -o ${CMAKE_CURRENT_BINARY_DIR}/common_res.o + DEPENDS ${MO_FILES} +) + +list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/common_res.o) + add_library(${PROJECT_NAME} SHARED ${SOURCES} $ $) target_link_libraries(${PROJECT_NAME} wininet version rpcrt4 comctl32) diff --git a/cmake/common.rc b/cmake/common.rc new file mode 100644 index 00000000..934b5c86 --- /dev/null +++ b/cmake/common.rc @@ -0,0 +1,7 @@ +/* +MinGW can't compile multiple .rc files. Only single. +*/ + +#include "../translations/translations.rc" +#include "../src/winsparkle.rc" + diff --git a/cmake/expat/CMakeLists.txt b/cmake/expat/CMakeLists.txt index 644f2f22..7f29f624 100755 --- a/cmake/expat/CMakeLists.txt +++ b/cmake/expat/CMakeLists.txt @@ -1,11 +1,15 @@ project(expat) -set(SOURCE_DIR ${ROOT_DIR}/3rdparty/expat) +set(SOURCE_DIR ${ROOT_DIR}/3rdparty/expat/expat) + +file(COPY ${SOURCE_DIR}/expat_config.h.cmake + DESTINATION ${CMAKE_CURRENT_SOURCE_DIR} +) cmake_minimum_required(VERSION 2.6) set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org") set(PACKAGE_NAME "expat") -set(PACKAGE_VERSION "2.1.0") +set(PACKAGE_VERSION "2.2.3") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}") @@ -31,8 +35,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${SOURCE_DIR}/lib) if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996) endif(MSVC) +add_definitions(-DWIN32) +add_definitions(-DXML_STATIC) set(expat_SRCS + ${SOURCE_DIR}/lib/loadlibrary.c ${SOURCE_DIR}/lib/xmlparse.c ${SOURCE_DIR}/lib/xmlrole.c ${SOURCE_DIR}/lib/xmltok.c diff --git a/cmake/expat/expat_config.h.cmake b/cmake/expat/expat_config.h.cmake new file mode 100644 index 00000000..25d79a6d --- /dev/null +++ b/cmake/expat/expat_config.h.cmake @@ -0,0 +1,91 @@ +/* expat_config.h.in. Generated from configure.in by autoheader. */ + +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#cmakedefine BYTEORDER @BYTEORDER@ + +/* Define to 1 if you have the `bcopy' function. */ +#cmakedefine HAVE_BCOPY + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_FCNTL_H + +/* Define to 1 if you have the `getpagesize' function. */ +#cmakedefine HAVE_GETPAGESIZE + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_INTTYPES_H + +/* Define to 1 if you have the `memmove' function. */ +#cmakedefine HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MEMORY_H + +/* Define to 1 if you have a working `mmap' system call. */ +#cmakedefine HAVE_MMAP + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_UNISTD_H + +/* Define to the address where bug reports for this package should be sent. */ +#cmakedefine PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#cmakedefine PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#cmakedefine PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#cmakedefine PACKAGE_TARNAME + +/* Define to the version of this package. */ +#cmakedefine PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#cmakedefine STDC_HEADERS + +/* whether byteorder is bigendian */ +#cmakedefine WORDS_BIGENDIAN + +/* Define to specify how much context to retain around the current parse + point. */ +#cmakedefine XML_CONTEXT_BYTES @XML_CONTEXT_BYTES@ + +/* Define to make parameter entity parsing functionality available. */ +#cmakedefine XML_DTD + +/* Define to make XML Namespaces functionality available. */ +#cmakedefine XML_NS + +/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */ +#ifdef _MSC_VER +# define __func__ __FUNCTION__ +#endif + +/* Define to `long' if does not define. */ +#cmakedefine off_t @OFF_T@ + +/* Define to `unsigned' if does not define. */ +#cmakedefine size_t @SIZE_T@ From 92d9eda737101f9d772ff1a38784706233d8ae8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 6 May 2021 11:51:35 +0200 Subject: [PATCH 2/3] Fix broken CMake support for MinGW32 8.1 --- cmake/CMakeLists.txt | 61 +---- cmake/crypto/CMakeLists.txt | 429 +++++++++++++++++++++++++++++++ cmake/expat/CMakeLists.txt | 1 - cmake/expat/expat_config.h.cmake | 46 +++- cmake/wxWidgets/CMakeLists.txt | 4 +- include/winsparkle.h | 1 + 6 files changed, 481 insertions(+), 61 deletions(-) create mode 100644 cmake/crypto/CMakeLists.txt diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 6feeffc8..f7f683e6 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -38,6 +38,7 @@ set(CONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") set(CMAKE_DEBUG_POSTFIX "d") set(EXPAT_INCLUDE_DIRS "${ROOT_DIR}/3rdparty/expat/expat/lib") +set(OPENSSL_INCLUDE_DIRS "${ROOT_DIR}/3rdparty/openssl-win32") # bundled expat add_subdirectory(expat) @@ -45,12 +46,16 @@ add_subdirectory(expat) # bundled wxWidgets add_subdirectory(wxWidgets) +# bundled crypto +add_subdirectory(crypto) + # WinSparkle set(SOURCE_DIR ${ROOT_DIR}/src) include_directories(${ROOT_DIR}/include) include_directories(${EXPAT_INCLUDE_DIRS}) include_directories(${wxWidgets_INCLUDE_DIRS}) +include_directories(${OPENSSL_INCLUDE_DIRS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") @@ -59,7 +64,8 @@ add_definitions( -DNTDDI_VERSION=0x06000000 -DBUILDING_WIN_SPARKLE -DXML_STATIC - -DUNICODE -D_UNICODE) + -DUNICODE -D_UNICODE + -U__STRICT_ANSI__) set(SOURCES ${SOURCE_DIR}/appcast.cpp @@ -79,52 +85,13 @@ set(PUBLIC_HEADERS ${ROOT_DIR}/include/winsparkle.h ${ROOT_DIR}/include/winsparkle-version.h) -set(LANGUAGES - ar - be - bg - bs - ca_ES - co - cs - da - de - el - es - eu - fr - fy_NL - ga - he - hr - hu - hy - id - it - ja - kk - ko - nb - nl - pl - pt_BR - pt_PT - ru - sk - sr - sv - tr - uk - zh_CN - zh_TW -) - -foreach(LANG ${LANGUAGES}) +file(GLOB PO_FILES ${ROOT_DIR}/translations/*.po) +foreach(PO_FILE ${PO_FILES}) + get_filename_component(LANG ${PO_FILE} NAME_WLE) add_custom_command(OUTPUT ${LANG}.mo - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c -o ${LANG}.mo ${ROOT_DIR}/translations/${LANG}.po - DEPENDS ${ROOT_DIR}/translations/${LANG}.po + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c -o ${LANG}.mo ${PO_FILE} + DEPENDS ${PO_FILE} ) - list(APPEND MO_FILES ${LANG}.mo) endforeach() @@ -136,9 +103,9 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/common_res.o list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/common_res.o) -add_library(${PROJECT_NAME} SHARED ${SOURCES} $ $) +add_library(${PROJECT_NAME} SHARED ${SOURCES} $ $ $) -target_link_libraries(${PROJECT_NAME} wininet version rpcrt4 comctl32 crypt32) +target_link_libraries(${PROJECT_NAME} wininet version rpcrt4 comctl32 crypt32 wsock32 ws2_32 UxTheme Shlwapi) set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_PATCH_VERSION} diff --git a/cmake/crypto/CMakeLists.txt b/cmake/crypto/CMakeLists.txt new file mode 100644 index 00000000..d70fe0c7 --- /dev/null +++ b/cmake/crypto/CMakeLists.txt @@ -0,0 +1,429 @@ +cmake_minimum_required(VERSION 2.6) + +project(crypto) + +set(SOURCE_DIR ${ROOT_DIR}/3rdparty/openssl/crypto) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${SOURCE_DIR}/../../openssl-win32 + ${SOURCE_DIR}/../../openssl-win32/openssl +) + +add_definitions( + -D_CRT_SECURE_NO_DEPRECATE + -DDSO_WIN32 + -DOPENSSL_SYSNAME_WIN32 + -DWIN32_LEAN_AND_MEAN + -DL_ENDIAN + -DOPENSSL_NO_ASM + -DOPENSSL_NO_INLINE_ASM + -DNO_WINDOWS_BRAINDEATH + -DMK1MF_BUILD + -DMK1MF_PLATFORM_VC_WIN32 + -D_LIB +) + + +# _CRT_SECURE_NO_WARNINGS; +# MK1MF_BUILD;MK1MF_PLATFORM_VC_WIN32;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + +set(crypto_SRCS + ${SOURCE_DIR}/asn1/a_bitstr.c + ${SOURCE_DIR}/asn1/a_bool.c + ${SOURCE_DIR}/asn1/a_bytes.c + ${SOURCE_DIR}/asn1/a_d2i_fp.c + ${SOURCE_DIR}/asn1/a_digest.c + ${SOURCE_DIR}/asn1/a_dup.c + ${SOURCE_DIR}/asn1/a_enum.c + ${SOURCE_DIR}/asn1/a_gentm.c + ${SOURCE_DIR}/asn1/a_i2d_fp.c + ${SOURCE_DIR}/asn1/a_int.c + ${SOURCE_DIR}/asn1/a_mbstr.c + ${SOURCE_DIR}/asn1/a_object.c + ${SOURCE_DIR}/asn1/a_octet.c + ${SOURCE_DIR}/asn1/a_print.c + ${SOURCE_DIR}/asn1/a_set.c + ${SOURCE_DIR}/asn1/a_sign.c + ${SOURCE_DIR}/asn1/a_strex.c + ${SOURCE_DIR}/asn1/a_strnid.c + ${SOURCE_DIR}/asn1/a_time.c + ${SOURCE_DIR}/asn1/a_type.c + ${SOURCE_DIR}/asn1/a_utctm.c + ${SOURCE_DIR}/asn1/a_utf8.c + ${SOURCE_DIR}/asn1/a_verify.c + ${SOURCE_DIR}/asn1/ameth_lib.c + ${SOURCE_DIR}/asn1/asn1_err.c + ${SOURCE_DIR}/asn1/asn1_gen.c + ${SOURCE_DIR}/asn1/asn1_lib.c + ${SOURCE_DIR}/asn1/asn1_par.c + ${SOURCE_DIR}/asn1/asn_mime.c + ${SOURCE_DIR}/asn1/asn_moid.c + ${SOURCE_DIR}/asn1/asn_pack.c + ${SOURCE_DIR}/asn1/bio_asn1.c + ${SOURCE_DIR}/asn1/bio_ndef.c + ${SOURCE_DIR}/asn1/d2i_pr.c + ${SOURCE_DIR}/asn1/d2i_pu.c + ${SOURCE_DIR}/asn1/evp_asn1.c + ${SOURCE_DIR}/asn1/f_enum.c + ${SOURCE_DIR}/asn1/f_int.c + ${SOURCE_DIR}/asn1/f_string.c + ${SOURCE_DIR}/asn1/i2d_pr.c + ${SOURCE_DIR}/asn1/i2d_pu.c + ${SOURCE_DIR}/asn1/nsseq.c + ${SOURCE_DIR}/asn1/p5_pbe.c + ${SOURCE_DIR}/asn1/p5_pbev2.c + ${SOURCE_DIR}/asn1/p8_pkey.c + ${SOURCE_DIR}/asn1/t_crl.c + ${SOURCE_DIR}/asn1/t_pkey.c + ${SOURCE_DIR}/asn1/t_req.c + ${SOURCE_DIR}/asn1/t_spki.c + ${SOURCE_DIR}/asn1/t_x509.c + ${SOURCE_DIR}/asn1/t_x509a.c + ${SOURCE_DIR}/asn1/tasn_dec.c + ${SOURCE_DIR}/asn1/tasn_enc.c + ${SOURCE_DIR}/asn1/tasn_fre.c + ${SOURCE_DIR}/asn1/tasn_new.c + ${SOURCE_DIR}/asn1/tasn_prn.c + ${SOURCE_DIR}/asn1/tasn_typ.c + ${SOURCE_DIR}/asn1/tasn_utl.c + ${SOURCE_DIR}/asn1/x_algor.c + ${SOURCE_DIR}/asn1/x_attrib.c + ${SOURCE_DIR}/asn1/x_bignum.c + ${SOURCE_DIR}/asn1/x_crl.c + ${SOURCE_DIR}/asn1/x_exten.c + ${SOURCE_DIR}/asn1/x_info.c + ${SOURCE_DIR}/asn1/x_long.c + ${SOURCE_DIR}/asn1/x_name.c + ${SOURCE_DIR}/asn1/x_nx509.c + ${SOURCE_DIR}/asn1/x_pkey.c + ${SOURCE_DIR}/asn1/x_pubkey.c + ${SOURCE_DIR}/asn1/x_req.c + ${SOURCE_DIR}/asn1/x_sig.c + ${SOURCE_DIR}/asn1/x_spki.c + ${SOURCE_DIR}/asn1/x_val.c + ${SOURCE_DIR}/asn1/x_x509.c + ${SOURCE_DIR}/asn1/x_x509a.c + + ${SOURCE_DIR}/bio/b_dump.c + ${SOURCE_DIR}/bio/b_print.c + ${SOURCE_DIR}/bio/b_sock.c + ${SOURCE_DIR}/bio/bf_buff.c + ${SOURCE_DIR}/bio/bio_cb.c + ${SOURCE_DIR}/bio/bio_err.c + ${SOURCE_DIR}/bio/bio_lib.c + ${SOURCE_DIR}/bio/bss_acpt.c + ${SOURCE_DIR}/bio/bss_bio.c + ${SOURCE_DIR}/bio/bss_conn.c + ${SOURCE_DIR}/bio/bss_fd.c + ${SOURCE_DIR}/bio/bss_file.c + ${SOURCE_DIR}/bio/bss_mem.c + ${SOURCE_DIR}/bio/bss_null.c + ${SOURCE_DIR}/bio/bss_sock.c + + ${SOURCE_DIR}/bn/bn_add.c + ${SOURCE_DIR}/bn/bn_asm.c + ${SOURCE_DIR}/bn/bn_blind.c + ${SOURCE_DIR}/bn/bn_const.c + ${SOURCE_DIR}/bn/bn_ctx.c + ${SOURCE_DIR}/bn/bn_div.c + ${SOURCE_DIR}/bn/bn_err.c + ${SOURCE_DIR}/bn/bn_exp.c + ${SOURCE_DIR}/bn/bn_exp2.c + ${SOURCE_DIR}/bn/bn_gcd.c + ${SOURCE_DIR}/bn/bn_kron.c + ${SOURCE_DIR}/bn/bn_lib.c + ${SOURCE_DIR}/bn/bn_mod.c + ${SOURCE_DIR}/bn/bn_mont.c + ${SOURCE_DIR}/bn/bn_mpi.c + ${SOURCE_DIR}/bn/bn_mul.c + ${SOURCE_DIR}/bn/bn_nist.c + ${SOURCE_DIR}/bn/bn_prime.c + ${SOURCE_DIR}/bn/bn_print.c + ${SOURCE_DIR}/bn/bn_rand.c + ${SOURCE_DIR}/bn/bn_recp.c + ${SOURCE_DIR}/bn/bn_shift.c + ${SOURCE_DIR}/bn/bn_sqr.c + ${SOURCE_DIR}/bn/bn_sqrt.c + ${SOURCE_DIR}/bn/bn_word.c + + ${SOURCE_DIR}/buffer/buf_err.c + ${SOURCE_DIR}/buffer/buf_str.c + ${SOURCE_DIR}/buffer/buffer.c + + ${SOURCE_DIR}/cmac/cm_ameth.c + ${SOURCE_DIR}/cmac/cm_pmeth.c + ${SOURCE_DIR}/cmac/cmac.c + + ${SOURCE_DIR}/conf/conf_api.c + ${SOURCE_DIR}/conf/conf_def.c + ${SOURCE_DIR}/conf/conf_err.c + ${SOURCE_DIR}/conf/conf_lib.c + ${SOURCE_DIR}/conf/conf_mall.c + ${SOURCE_DIR}/conf/conf_mod.c + ${SOURCE_DIR}/conf/conf_sap.c + + ${SOURCE_DIR}/cpt_err.c + ${SOURCE_DIR}/cryptlib.c + ${SOURCE_DIR}/cversion.c + ${SOURCE_DIR}/ebcdic.c + ${SOURCE_DIR}/ex_data.c + ${SOURCE_DIR}/getenv.c + ${SOURCE_DIR}/mem.c + ${SOURCE_DIR}/mem_clr.c + ${SOURCE_DIR}/mem_dbg.c + ${SOURCE_DIR}/o_dir.c + ${SOURCE_DIR}/o_init.c + ${SOURCE_DIR}/o_str.c + ${SOURCE_DIR}/o_time.c + ${SOURCE_DIR}/objects/o_names.c + ${SOURCE_DIR}/uid.c + + ${SOURCE_DIR}/dsa/dsa_ameth.c + ${SOURCE_DIR}/dsa/dsa_asn1.c + ${SOURCE_DIR}/dsa/dsa_err.c + ${SOURCE_DIR}/dsa/dsa_gen.c + ${SOURCE_DIR}/dsa/dsa_key.c + ${SOURCE_DIR}/dsa/dsa_lib.c + ${SOURCE_DIR}/dsa/dsa_ossl.c + ${SOURCE_DIR}/dsa/dsa_pmeth.c + ${SOURCE_DIR}/dsa/dsa_prn.c + ${SOURCE_DIR}/dsa/dsa_sign.c + ${SOURCE_DIR}/dsa/dsa_vrf.c + + ${SOURCE_DIR}/dso/dso_beos.c + ${SOURCE_DIR}/dso/dso_dl.c + ${SOURCE_DIR}/dso/dso_dlfcn.c + ${SOURCE_DIR}/dso/dso_err.c + ${SOURCE_DIR}/dso/dso_lib.c + ${SOURCE_DIR}/dso/dso_null.c + ${SOURCE_DIR}/dso/dso_openssl.c + ${SOURCE_DIR}/dso/dso_vms.c + ${SOURCE_DIR}/dso/dso_win32.c + + ${SOURCE_DIR}/err/err.c + ${SOURCE_DIR}/err/err_all.c + ${SOURCE_DIR}/err/err_prn.c + + ${SOURCE_DIR}/evp/bio_b64.c + ${SOURCE_DIR}/evp/bio_enc.c + ${SOURCE_DIR}/evp/bio_md.c + ${SOURCE_DIR}/evp/bio_ok.c + ${SOURCE_DIR}/evp/digest.c + ${SOURCE_DIR}/evp/e_null.c + ${SOURCE_DIR}/evp/e_rc4.c + ${SOURCE_DIR}/evp/e_rc4_hmac_md5.c + ${SOURCE_DIR}/evp/e_seed.c + ${SOURCE_DIR}/evp/encode.c + ${SOURCE_DIR}/evp/evp_cnf.c + ${SOURCE_DIR}/evp/evp_enc.c + ${SOURCE_DIR}/evp/evp_err.c + ${SOURCE_DIR}/evp/evp_key.c + ${SOURCE_DIR}/evp/evp_lib.c + ${SOURCE_DIR}/evp/evp_pbe.c + ${SOURCE_DIR}/evp/evp_pkey.c + ${SOURCE_DIR}/evp/m_dss.c + ${SOURCE_DIR}/evp/m_dss1.c + ${SOURCE_DIR}/evp/m_ecdsa.c + ${SOURCE_DIR}/evp/m_md4.c + ${SOURCE_DIR}/evp/m_md5.c + ${SOURCE_DIR}/evp/m_null.c + ${SOURCE_DIR}/evp/m_sha.c + ${SOURCE_DIR}/evp/m_sha1.c + ${SOURCE_DIR}/evp/m_sigver.c + ${SOURCE_DIR}/evp/names.c + ${SOURCE_DIR}/evp/p5_crpt.c + ${SOURCE_DIR}/evp/p5_crpt2.c + ${SOURCE_DIR}/evp/p_dec.c + ${SOURCE_DIR}/evp/p_enc.c + ${SOURCE_DIR}/evp/p_lib.c + ${SOURCE_DIR}/evp/p_seal.c + ${SOURCE_DIR}/evp/p_sign.c + ${SOURCE_DIR}/evp/p_verify.c + ${SOURCE_DIR}/evp/pmeth_fn.c + ${SOURCE_DIR}/evp/pmeth_gn.c + ${SOURCE_DIR}/evp/pmeth_lib.c + + ${SOURCE_DIR}/hmac/hm_ameth.c + ${SOURCE_DIR}/hmac/hm_pmeth.c + ${SOURCE_DIR}/hmac/hmac.c + + ${SOURCE_DIR}/krb5/krb5_asn.c + + ${SOURCE_DIR}/lhash/lh_stats.c + ${SOURCE_DIR}/lhash/lhash.c + + ${SOURCE_DIR}/md4/md4_dgst.c + ${SOURCE_DIR}/md4/md4_one.c + + ${SOURCE_DIR}/md5/md5_dgst.c + ${SOURCE_DIR}/md5/md5_one.c + + ${SOURCE_DIR}/modes/cbc128.c + ${SOURCE_DIR}/modes/ccm128.c + ${SOURCE_DIR}/modes/cfb128.c + ${SOURCE_DIR}/modes/ctr128.c + ${SOURCE_DIR}/modes/cts128.c + ${SOURCE_DIR}/modes/gcm128.c + ${SOURCE_DIR}/modes/ofb128.c + ${SOURCE_DIR}/modes/wrap128.c + ${SOURCE_DIR}/modes/xts128.c + + ${SOURCE_DIR}/objects/obj_dat.c + ${SOURCE_DIR}/objects/obj_err.c + ${SOURCE_DIR}/objects/obj_lib.c + ${SOURCE_DIR}/objects/obj_xref.c + + ${SOURCE_DIR}/ocsp/ocsp_asn.c + ${SOURCE_DIR}/ocsp/ocsp_cl.c + ${SOURCE_DIR}/ocsp/ocsp_err.c + ${SOURCE_DIR}/ocsp/ocsp_ext.c + ${SOURCE_DIR}/ocsp/ocsp_ht.c + ${SOURCE_DIR}/ocsp/ocsp_lib.c + ${SOURCE_DIR}/ocsp/ocsp_prn.c + ${SOURCE_DIR}/ocsp/ocsp_srv.c + ${SOURCE_DIR}/ocsp/ocsp_vfy.c + + ${SOURCE_DIR}/pem/pem_all.c + ${SOURCE_DIR}/pem/pem_err.c + ${SOURCE_DIR}/pem/pem_info.c + ${SOURCE_DIR}/pem/pem_lib.c + ${SOURCE_DIR}/pem/pem_oth.c + ${SOURCE_DIR}/pem/pem_pk8.c + ${SOURCE_DIR}/pem/pem_pkey.c + ${SOURCE_DIR}/pem/pem_seal.c + ${SOURCE_DIR}/pem/pem_sign.c + ${SOURCE_DIR}/pem/pem_x509.c + ${SOURCE_DIR}/pem/pem_xaux.c + + ${SOURCE_DIR}/pkcs12/p12_add.c + ${SOURCE_DIR}/pkcs12/p12_asn.c + ${SOURCE_DIR}/pkcs12/p12_attr.c + ${SOURCE_DIR}/pkcs12/p12_crpt.c + ${SOURCE_DIR}/pkcs12/p12_crt.c + ${SOURCE_DIR}/pkcs12/p12_decr.c + ${SOURCE_DIR}/pkcs12/p12_init.c + ${SOURCE_DIR}/pkcs12/p12_key.c + ${SOURCE_DIR}/pkcs12/p12_kiss.c + ${SOURCE_DIR}/pkcs12/p12_mutl.c + ${SOURCE_DIR}/pkcs12/p12_npas.c + ${SOURCE_DIR}/pkcs12/p12_p8d.c + ${SOURCE_DIR}/pkcs12/p12_p8e.c + ${SOURCE_DIR}/pkcs12/p12_utl.c + ${SOURCE_DIR}/pkcs12/pk12err.c + + ${SOURCE_DIR}/pkcs7/bio_pk7.c + ${SOURCE_DIR}/pkcs7/pk7_asn1.c + ${SOURCE_DIR}/pkcs7/pk7_attr.c + ${SOURCE_DIR}/pkcs7/pk7_doit.c + ${SOURCE_DIR}/pkcs7/pk7_lib.c + ${SOURCE_DIR}/pkcs7/pk7_mime.c + ${SOURCE_DIR}/pkcs7/pk7_smime.c + ${SOURCE_DIR}/pkcs7/pkcs7err.c + + ${SOURCE_DIR}/pqueue/pqueue.c + + ${SOURCE_DIR}/rand/md_rand.c + ${SOURCE_DIR}/rand/rand_egd.c + ${SOURCE_DIR}/rand/rand_err.c + ${SOURCE_DIR}/rand/rand_lib.c + ${SOURCE_DIR}/rand/rand_win.c + ${SOURCE_DIR}/rand/randfile.c + + ${SOURCE_DIR}/rc4/rc4_enc.c + ${SOURCE_DIR}/rc4/rc4_skey.c + ${SOURCE_DIR}/rc4/rc4_utl.c + + ${SOURCE_DIR}/sha/sha1_one.c + ${SOURCE_DIR}/sha/sha1dgst.c + ${SOURCE_DIR}/sha/sha256.c + ${SOURCE_DIR}/sha/sha512.c + ${SOURCE_DIR}/sha/sha_dgst.c + ${SOURCE_DIR}/sha/sha_one.c + + ${SOURCE_DIR}/stack/stack.c + + # ${SOURCE_DIR}/threads/th-lock.c + + ${SOURCE_DIR}/ts/ts_asn1.c + ${SOURCE_DIR}/ts/ts_conf.c + ${SOURCE_DIR}/ts/ts_err.c + ${SOURCE_DIR}/ts/ts_lib.c + ${SOURCE_DIR}/ts/ts_req_print.c + ${SOURCE_DIR}/ts/ts_req_utils.c + ${SOURCE_DIR}/ts/ts_rsp_print.c + ${SOURCE_DIR}/ts/ts_rsp_sign.c + ${SOURCE_DIR}/ts/ts_rsp_utils.c + ${SOURCE_DIR}/ts/ts_rsp_verify.c + ${SOURCE_DIR}/ts/ts_verify_ctx.c + + ${SOURCE_DIR}/txt_db/txt_db.c + + ${SOURCE_DIR}/ui/ui_compat.c + ${SOURCE_DIR}/ui/ui_err.c + ${SOURCE_DIR}/ui/ui_lib.c + ${SOURCE_DIR}/ui/ui_openssl.c + ${SOURCE_DIR}/ui/ui_util.c + + ${SOURCE_DIR}/x509/by_dir.c + ${SOURCE_DIR}/x509/by_file.c + ${SOURCE_DIR}/x509/x509_att.c + ${SOURCE_DIR}/x509/x509_cmp.c + ${SOURCE_DIR}/x509/x509_d2.c + ${SOURCE_DIR}/x509/x509_def.c + ${SOURCE_DIR}/x509/x509_err.c + ${SOURCE_DIR}/x509/x509_ext.c + ${SOURCE_DIR}/x509/x509_lu.c + ${SOURCE_DIR}/x509/x509_obj.c + ${SOURCE_DIR}/x509/x509_r2x.c + ${SOURCE_DIR}/x509/x509_req.c + ${SOURCE_DIR}/x509/x509_set.c + ${SOURCE_DIR}/x509/x509_trs.c + ${SOURCE_DIR}/x509/x509_txt.c + ${SOURCE_DIR}/x509/x509_v3.c + ${SOURCE_DIR}/x509/x509_vfy.c + ${SOURCE_DIR}/x509/x509_vpm.c + ${SOURCE_DIR}/x509/x509cset.c + ${SOURCE_DIR}/x509/x509name.c + ${SOURCE_DIR}/x509/x509rset.c + ${SOURCE_DIR}/x509/x509spki.c + ${SOURCE_DIR}/x509/x509type.c + ${SOURCE_DIR}/x509/x_all.c + ${SOURCE_DIR}/x509v3/pcy_cache.c + ${SOURCE_DIR}/x509v3/pcy_data.c + ${SOURCE_DIR}/x509v3/pcy_lib.c + ${SOURCE_DIR}/x509v3/pcy_map.c + ${SOURCE_DIR}/x509v3/pcy_node.c + ${SOURCE_DIR}/x509v3/pcy_tree.c + ${SOURCE_DIR}/x509v3/v3_akey.c + ${SOURCE_DIR}/x509v3/v3_akeya.c + ${SOURCE_DIR}/x509v3/v3_alt.c + ${SOURCE_DIR}/x509v3/v3_bcons.c + ${SOURCE_DIR}/x509v3/v3_bitst.c + ${SOURCE_DIR}/x509v3/v3_conf.c + ${SOURCE_DIR}/x509v3/v3_cpols.c + ${SOURCE_DIR}/x509v3/v3_crld.c + ${SOURCE_DIR}/x509v3/v3_enum.c + ${SOURCE_DIR}/x509v3/v3_extku.c + ${SOURCE_DIR}/x509v3/v3_genn.c + ${SOURCE_DIR}/x509v3/v3_ia5.c + ${SOURCE_DIR}/x509v3/v3_info.c + ${SOURCE_DIR}/x509v3/v3_int.c + ${SOURCE_DIR}/x509v3/v3_lib.c + ${SOURCE_DIR}/x509v3/v3_ncons.c + ${SOURCE_DIR}/x509v3/v3_ocsp.c + ${SOURCE_DIR}/x509v3/v3_pci.c + ${SOURCE_DIR}/x509v3/v3_pcia.c + ${SOURCE_DIR}/x509v3/v3_pcons.c + ${SOURCE_DIR}/x509v3/v3_pku.c + ${SOURCE_DIR}/x509v3/v3_pmaps.c + ${SOURCE_DIR}/x509v3/v3_prn.c + ${SOURCE_DIR}/x509v3/v3_purp.c + ${SOURCE_DIR}/x509v3/v3_scts.c + ${SOURCE_DIR}/x509v3/v3_skey.c + ${SOURCE_DIR}/x509v3/v3_sxnet.c + ${SOURCE_DIR}/x509v3/v3_utl.c + ${SOURCE_DIR}/x509v3/v3err.c +) + +add_library(crypto OBJECT ${crypto_SRCS}) diff --git a/cmake/expat/CMakeLists.txt b/cmake/expat/CMakeLists.txt index 7f29f624..7483975b 100755 --- a/cmake/expat/CMakeLists.txt +++ b/cmake/expat/CMakeLists.txt @@ -39,7 +39,6 @@ add_definitions(-DWIN32) add_definitions(-DXML_STATIC) set(expat_SRCS - ${SOURCE_DIR}/lib/loadlibrary.c ${SOURCE_DIR}/lib/xmlparse.c ${SOURCE_DIR}/lib/xmlrole.c ${SOURCE_DIR}/lib/xmltok.c diff --git a/cmake/expat/expat_config.h.cmake b/cmake/expat/expat_config.h.cmake index 25d79a6d..173fed16 100644 --- a/cmake/expat/expat_config.h.cmake +++ b/cmake/expat/expat_config.h.cmake @@ -1,10 +1,13 @@ -/* expat_config.h.in. Generated from configure.in by autoheader. */ +/* expat_config.h.cmake. Based upon generated expat_config.h.in. */ /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ #cmakedefine BYTEORDER @BYTEORDER@ -/* Define to 1 if you have the `bcopy' function. */ -#cmakedefine HAVE_BCOPY +/* Define to 1 if you have the `arc4random' function. */ +#cmakedefine HAVE_ARC4RANDOM + +/* Define to 1 if you have the `arc4random_buf' function. */ +#cmakedefine HAVE_ARC4RANDOM_BUF /* Define to 1 if you have the header file. */ #cmakedefine HAVE_DLFCN_H @@ -15,11 +18,14 @@ /* Define to 1 if you have the `getpagesize' function. */ #cmakedefine HAVE_GETPAGESIZE +/* Define to 1 if you have the `getrandom' function. */ +#cmakedefine HAVE_GETRANDOM + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_INTTYPES_H -/* Define to 1 if you have the `memmove' function. */ -#cmakedefine HAVE_MEMMOVE +/* Define to 1 if you have the `bsd' library (-lbsd). */ +#cmakedefine HAVE_LIBBSD /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MEMORY_H @@ -39,6 +45,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STRING_H +/* Define to 1 if you have `syscall' and `SYS_getrandom'. */ +#cmakedefine HAVE_SYSCALL_GETRANDOM + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_STAT_H @@ -48,20 +57,26 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H +/* Name of package */ +#define PACKAGE "@PACKAGE_NAME@" + /* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT +#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" /* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME +#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@" /* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING +#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@" /* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME +#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" /* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION +#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@" /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS @@ -69,10 +84,19 @@ /* whether byteorder is bigendian */ #cmakedefine WORDS_BIGENDIAN +/* Define to allow retrieving the byte offsets for attribute names and values. + */ +#cmakedefine XML_ATTR_INFO + /* Define to specify how much context to retain around the current parse point. */ #cmakedefine XML_CONTEXT_BYTES @XML_CONTEXT_BYTES@ +#if ! defined(_WIN32) +/* Define to include code reading entropy from `/dev/urandom'. */ + #cmakedefine XML_DEV_URANDOM +#endif + /* Define to make parameter entity parsing functionality available. */ #cmakedefine XML_DTD @@ -81,7 +105,7 @@ /* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */ #ifdef _MSC_VER -# define __func__ __FUNCTION__ +# define __func__ __FUNCTION__ #endif /* Define to `long' if does not define. */ diff --git a/cmake/wxWidgets/CMakeLists.txt b/cmake/wxWidgets/CMakeLists.txt index eecf75a7..91ee7cf4 100644 --- a/cmake/wxWidgets/CMakeLists.txt +++ b/cmake/wxWidgets/CMakeLists.txt @@ -95,6 +95,7 @@ set(SOURCES ${SOURCE_DIR}/wxWidgets/src/common/strconv.cpp ${SOURCE_DIR}/wxWidgets/src/common/string.cpp ${SOURCE_DIR}/wxWidgets/src/common/stringimpl.cpp + ${SOURCE_DIR}/wxWidgets/src/common/stringops.cpp ${SOURCE_DIR}/wxWidgets/src/common/strvararg.cpp ${SOURCE_DIR}/wxWidgets/src/common/sysopt.cpp ${SOURCE_DIR}/wxWidgets/src/common/textbuf.cpp @@ -158,16 +159,15 @@ set(SOURCES ${SOURCE_DIR}/wxWidgets/src/msw/menu.cpp ${SOURCE_DIR}/wxWidgets/src/msw/menuitem.cpp ${SOURCE_DIR}/wxWidgets/src/msw/msgdlg.cpp - ${SOURCE_DIR}/wxWidgets/src/msw/mslu.cpp ${SOURCE_DIR}/wxWidgets/src/msw/nativdlg.cpp ${SOURCE_DIR}/wxWidgets/src/msw/nativewin.cpp ${SOURCE_DIR}/wxWidgets/src/msw/nonownedwnd.cpp ${SOURCE_DIR}/wxWidgets/src/msw/ole/activex.cpp + ${SOURCE_DIR}/wxWidgets/src/msw/ole/comimpl.cpp ${SOURCE_DIR}/wxWidgets/src/msw/ole/dataobj.cpp ${SOURCE_DIR}/wxWidgets/src/msw/ole/oleutils.cpp ${SOURCE_DIR}/wxWidgets/src/msw/ole/safearray.cpp ${SOURCE_DIR}/wxWidgets/src/msw/ole/uuid.cpp - ${SOURCE_DIR}/wxWidgets/src/msw/panel.cpp ${SOURCE_DIR}/wxWidgets/src/msw/pen.cpp ${SOURCE_DIR}/wxWidgets/src/msw/power.cpp ${SOURCE_DIR}/wxWidgets/src/msw/region.cpp diff --git a/include/winsparkle.h b/include/winsparkle.h index fb6250cb..752c093a 100644 --- a/include/winsparkle.h +++ b/include/winsparkle.h @@ -27,6 +27,7 @@ #define _winsparkle_h_ #include +#include #include "winsparkle-version.h" From ac6054ecc178f2a1ca4241c8fa057f543a31a126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 31 May 2021 11:16:17 +0200 Subject: [PATCH 3/3] Remove redundant expat_config.h.cmake --- cmake/expat/CMakeLists.txt | 10 +-- cmake/expat/expat_config.h.cmake | 115 ------------------------------- 2 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 cmake/expat/expat_config.h.cmake diff --git a/cmake/expat/CMakeLists.txt b/cmake/expat/CMakeLists.txt index 7483975b..09602b4d 100755 --- a/cmake/expat/CMakeLists.txt +++ b/cmake/expat/CMakeLists.txt @@ -2,16 +2,8 @@ project(expat) set(SOURCE_DIR ${ROOT_DIR}/3rdparty/expat/expat) -file(COPY ${SOURCE_DIR}/expat_config.h.cmake - DESTINATION ${CMAKE_CURRENT_SOURCE_DIR} -) - cmake_minimum_required(VERSION 2.6) -set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org") -set(PACKAGE_NAME "expat") -set(PACKAGE_VERSION "2.2.3") -set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -set(PACKAGE_TARNAME "${PACKAGE_NAME}") + # configuration options set(XML_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to retain around the current parse point") diff --git a/cmake/expat/expat_config.h.cmake b/cmake/expat/expat_config.h.cmake deleted file mode 100644 index 173fed16..00000000 --- a/cmake/expat/expat_config.h.cmake +++ /dev/null @@ -1,115 +0,0 @@ -/* expat_config.h.cmake. Based upon generated expat_config.h.in. */ - -/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#cmakedefine BYTEORDER @BYTEORDER@ - -/* Define to 1 if you have the `arc4random' function. */ -#cmakedefine HAVE_ARC4RANDOM - -/* Define to 1 if you have the `arc4random_buf' function. */ -#cmakedefine HAVE_ARC4RANDOM_BUF - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_FCNTL_H - -/* Define to 1 if you have the `getpagesize' function. */ -#cmakedefine HAVE_GETPAGESIZE - -/* Define to 1 if you have the `getrandom' function. */ -#cmakedefine HAVE_GETRANDOM - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H - -/* Define to 1 if you have the `bsd' library (-lbsd). */ -#cmakedefine HAVE_LIBBSD - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H - -/* Define to 1 if you have a working `mmap' system call. */ -#cmakedefine HAVE_MMAP - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRING_H - -/* Define to 1 if you have `syscall' and `SYS_getrandom'. */ -#cmakedefine HAVE_SYSCALL_GETRANDOM - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_UNISTD_H - -/* Name of package */ -#define PACKAGE "@PACKAGE_NAME@" - -/* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" - -/* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@" - -/* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@" - -/* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@" - -/* Define to 1 if you have the ANSI C header files. */ -#cmakedefine STDC_HEADERS - -/* whether byteorder is bigendian */ -#cmakedefine WORDS_BIGENDIAN - -/* Define to allow retrieving the byte offsets for attribute names and values. - */ -#cmakedefine XML_ATTR_INFO - -/* Define to specify how much context to retain around the current parse - point. */ -#cmakedefine XML_CONTEXT_BYTES @XML_CONTEXT_BYTES@ - -#if ! defined(_WIN32) -/* Define to include code reading entropy from `/dev/urandom'. */ - #cmakedefine XML_DEV_URANDOM -#endif - -/* Define to make parameter entity parsing functionality available. */ -#cmakedefine XML_DTD - -/* Define to make XML Namespaces functionality available. */ -#cmakedefine XML_NS - -/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */ -#ifdef _MSC_VER -# define __func__ __FUNCTION__ -#endif - -/* Define to `long' if does not define. */ -#cmakedefine off_t @OFF_T@ - -/* Define to `unsigned' if does not define. */ -#cmakedefine size_t @SIZE_T@