diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2023-09-12 08:58:44 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2023-10-05 09:46:02 +0200 |
commit | 7683a8b7a9e8f4be61a5dee67667db54646d80d3 (patch) | |
tree | 39fcc139d34e56be03f2045b21a05e2d6d290c5b /libxerces-c/xercesc | |
parent | 7a9ad23a9ec80a37308ab75c23c67da57287dd80 (diff) |
Release version 3.2.4+2v3.2.4+2
- Don't insist on LIBXERCES_C_{SHARED,STATIC} for non-Windows platforms.
- Don't link winsock if network support is disabled.
- Add binary distribution package build configurations.
Diffstat (limited to 'libxerces-c/xercesc')
-rw-r--r-- | libxerces-c/xercesc/buildfile | 6 | ||||
-rw-r--r-- | libxerces-c/xercesc/util/Xerces_autoconf_config.hpp | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libxerces-c/xercesc/buildfile b/libxerces-c/xercesc/buildfile index 15f61b1..88cf9b1 100644 --- a/libxerces-c/xercesc/buildfile +++ b/libxerces-c/xercesc/buildfile @@ -126,7 +126,8 @@ switch $tclass, $tsys # cxx.loptions += -Wl,--no-undefined - cxx.libs += -lws2_32 + if $network + cxx.libs += -lws2_32 } case 'windows' { @@ -137,7 +138,8 @@ switch $tclass, $tsys if! $transcoder_icu cxx.libs += advapi32.lib - cxx.libs += ws2_32.lib + if $network + cxx.libs += ws2_32.lib } case 'linux' { diff --git a/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp b/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp index 2b088cf..e88b063 100644 --- a/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp +++ b/libxerces-c/xercesc/util/Xerces_autoconf_config.hpp @@ -135,10 +135,15 @@ * type. Note that falling back to defining the XERCES_PLATFORM_IMPORT macro * as empty would work for both the static and shared libraries (being * sub-optimal for the later) but only for functions. Xerces-C++, however, - * also exports data symbols, which cannot be imported this way. Thus we, - * just issue an error. + * also exports data symbols, which cannot be imported this way. Thus, + * where matters (Windows), we just issue an error. */ -# error define LIBXERCES_C_STATIC or LIBXERCES_C_SHARED preprocessor macro to signal Xerces-C++ library type being linked +# ifdef _WIN32 +# error define LIBXERCES_C_STATIC or LIBXERCES_C_SHARED preprocessor macro to signal Xerces-C++ library type being linked +# else +# define XERCES_PLATFORM_IMPORT +# define XERCES_PLATFORM_DECEXPORT +# endif #endif #ifdef XERCES_DLL_EXPORT |