diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-14 12:21:54 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-14 12:21:54 +0200 |
commit | ffb9168aa83b8d61dd4af2d9516b14eb657ce08a (patch) | |
tree | 24692eb6816a5b7d6b27d3a83dc300692e6c5ef9 /odb/pgsql/details | |
parent | 2ce1b689c40e1fed002c960f1fbbee5058ed1627 (diff) |
Initial build2 build support
Diffstat (limited to 'odb/pgsql/details')
-rw-r--r-- | odb/pgsql/details/build2/config-vc.h | 16 | ||||
-rw-r--r-- | odb/pgsql/details/build2/config.h | 18 | ||||
-rw-r--r-- | odb/pgsql/details/export.hxx | 39 |
3 files changed, 73 insertions, 0 deletions
diff --git a/odb/pgsql/details/build2/config-vc.h b/odb/pgsql/details/build2/config-vc.h new file mode 100644 index 0000000..35ebb42 --- /dev/null +++ b/odb/pgsql/details/build2/config-vc.h @@ -0,0 +1,16 @@ +/* file : odb/pgsql/details/build2/config-vc.h + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++ for the build2 build. */ + +#ifndef ODB_PGSQL_DETAILS_CONFIG_VC_H +#define ODB_PGSQL_DETAILS_CONFIG_VC_H + +/* Define LIBODB_PGSQL_BUILD2 for the installed case. */ +#ifndef LIBODB_PGSQL_BUILD2 +# define LIBODB_PGSQL_BUILD2 +#endif + +#endif /* ODB_PGSQL_DETAILS_CONFIG_VC_H */ diff --git a/odb/pgsql/details/build2/config.h b/odb/pgsql/details/build2/config.h new file mode 100644 index 0000000..1983f05 --- /dev/null +++ b/odb/pgsql/details/build2/config.h @@ -0,0 +1,18 @@ +/* file : odb/pgsql/details/build2/config.h + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Static configuration file for the build2 build. The installed case + (when LIBODB_PGSQL_BUILD2 is not necessarily defined) is the only + reason we have it. */ + +#ifndef ODB_PGSQL_DETAILS_CONFIG_H +#define ODB_PGSQL_DETAILS_CONFIG_H + +/* Define LIBODB_PGSQL_BUILD2 for the installed case. */ +#ifndef LIBODB_PGSQL_BUILD2 +# define LIBODB_PGSQL_BUILD2 +#endif + +#endif /* ODB_PGSQL_DETAILS_CONFIG_H */ diff --git a/odb/pgsql/details/export.hxx b/odb/pgsql/details/export.hxx index a4bb3f5..513ab58 100644 --- a/odb/pgsql/details/export.hxx +++ b/odb/pgsql/details/export.hxx @@ -9,6 +9,43 @@ #include <odb/pgsql/details/config.hxx> +// Normally we don't export class templates (but do complete specializations), +// inline functions, and classes with only inline member functions. Exporting +// classes that inherit from non-exported/imported bases (e.g., std::string) +// will end up badly. The only known workarounds are to not inherit or to not +// export. Also, MinGW GCC doesn't like seeing non-exported function being +// used before their inline definition. The workaround is to reorder code. In +// the end it's all trial and error. + +#ifdef LIBODB_PGSQL_BUILD2 + +#if defined(LIBODB_PGSQL_STATIC) // Using static. +# define LIBODB_PGSQL_EXPORT +#elif defined(LIBODB_PGSQL_STATIC_BUILD) // Building static. +# define LIBODB_PGSQL_EXPORT +#elif defined(LIBODB_PGSQL_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBODB_PGSQL_EXPORT __declspec(dllimport) +# else +# define LIBODB_PGSQL_EXPORT +# endif +#elif defined(LIBODB_PGSQL_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBODB_PGSQL_EXPORT __declspec(dllexport) +# else +# define LIBODB_PGSQL_EXPORT +# endif +#else +// If none of the above macros are defined, then we assume we are being used +// by some third-party build system that cannot/doesn't signal the library +// type. Note that this fallback works for both static and shared but in case +// of shared will be sub-optimal compared to having dllimport. +// +# define LIBODB_PGSQL_EXPORT // Using static or shared. +#endif + +#else // LIBODB_PGSQL_BUILD2 + #ifdef LIBODB_PGSQL_STATIC_LIB # define LIBODB_PGSQL_EXPORT #else @@ -35,6 +72,8 @@ # endif #endif +#endif // LIBODB_PGSQL_BUILD2 + #include <odb/post.hxx> #endif // ODB_PGSQL_DETAILS_EXPORT_HXX |