aboutsummaryrefslogtreecommitdiff
path: root/odb/sqlite/details
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-08 08:41:01 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-08 08:41:01 +0200
commit1135f674150e9486c91bc16e9fb09aa755591e25 (patch)
treecc8798f75c87c97da6b317b337cfb5fe89242022 /odb/sqlite/details
parent2dbfb23e8ada74da6d54e5398cd3071de6b10423 (diff)
Initial build2 build support
Diffstat (limited to 'odb/sqlite/details')
-rw-r--r--odb/sqlite/details/build2/config-vc.h16
-rw-r--r--odb/sqlite/details/build2/config.h18
-rw-r--r--odb/sqlite/details/config.hxx2
-rw-r--r--odb/sqlite/details/export.hxx39
4 files changed, 74 insertions, 1 deletions
diff --git a/odb/sqlite/details/build2/config-vc.h b/odb/sqlite/details/build2/config-vc.h
new file mode 100644
index 0000000..0fd79ee
--- /dev/null
+++ b/odb/sqlite/details/build2/config-vc.h
@@ -0,0 +1,16 @@
+/* file : odb/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_SQLITE_DETAILS_CONFIG_VC_H
+#define ODB_SQLITE_DETAILS_CONFIG_VC_H
+
+/* Define LIBODB_SQLITE_BUILD2 for the installed case. */
+#ifndef LIBODB_SQLITE_BUILD2
+# define LIBODB_SQLITE_BUILD2
+#endif
+
+#endif /* ODB_SQLITE_DETAILS_CONFIG_VC_H */
diff --git a/odb/sqlite/details/build2/config.h b/odb/sqlite/details/build2/config.h
new file mode 100644
index 0000000..2aa7d54
--- /dev/null
+++ b/odb/sqlite/details/build2/config.h
@@ -0,0 +1,18 @@
+/* file : odb/sqlite/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_SQLITE_BUILD2 is not necessarily defined) is the only
+ reason we have it. */
+
+#ifndef ODB_SQLITE_DETAILS_CONFIG_H
+#define ODB_SQLITE_DETAILS_CONFIG_H
+
+/* Define LIBODB_SQLITE_BUILD2 for the installed case. */
+#ifndef LIBODB_SQLITE_BUILD2
+# define LIBODB_SQLITE_BUILD2
+#endif
+
+#endif /* ODB_SQLITE_DETAILS_CONFIG_H */
diff --git a/odb/sqlite/details/config.hxx b/odb/sqlite/details/config.hxx
index ec89ed6..1f31178 100644
--- a/odb/sqlite/details/config.hxx
+++ b/odb/sqlite/details/config.hxx
@@ -10,7 +10,7 @@
#ifdef ODB_COMPILER
# error libodb-sqlite header included in odb-compiled header
#elif !defined(LIBODB_SQLITE_BUILD2)
-# elif defined(_MSC_VER)
+# ifdef _MSC_VER
# include <odb/details/config-vc.h>
# else
# include <odb/details/config.h>
diff --git a/odb/sqlite/details/export.hxx b/odb/sqlite/details/export.hxx
index 30e9f8b..11a5f0a 100644
--- a/odb/sqlite/details/export.hxx
+++ b/odb/sqlite/details/export.hxx
@@ -9,6 +9,43 @@
#include <odb/sqlite/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_SQLITE_BUILD2
+
+#if defined(LIBODB_SQLITE_STATIC) // Using static.
+# define LIBODB_SQLITE_EXPORT
+#elif defined(LIBODB_SQLITE_STATIC_BUILD) // Building static.
+# define LIBODB_SQLITE_EXPORT
+#elif defined(LIBODB_SQLITE_SHARED) // Using shared.
+# ifdef _WIN32
+# define LIBODB_SQLITE_EXPORT __declspec(dllimport)
+# else
+# define LIBODB_SQLITE_EXPORT
+# endif
+#elif defined(LIBODB_SQLITE_SHARED_BUILD) // Building shared.
+# ifdef _WIN32
+# define LIBODB_SQLITE_EXPORT __declspec(dllexport)
+# else
+# define LIBODB_SQLITE_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_SQLITE_EXPORT // Using static or shared.
+#endif
+
+#else // LIBODB_SQLITE_BUILD2
+
#ifdef LIBODB_SQLITE_STATIC_LIB
# define LIBODB_SQLITE_EXPORT
#else
@@ -35,6 +72,8 @@
# endif
#endif
+#endif // LIBODB_SQLITE_BUILD2
+
#include <odb/post.hxx>
#endif // ODB_SQLITE_DETAILS_EXPORT_HXX