From 783efe3b1649f3426613e3c151e47c33a854010c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 Nov 2016 18:24:02 +0200
Subject: Add initial support for build2 build

---
 cutl/details/build2/config-vc.h | 16 ++++++++++++++++
 cutl/details/build2/config.h    | 16 ++++++++++++++++
 cutl/details/config.hxx         | 14 +++++++++++---
 cutl/details/export.hxx         | 39 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 cutl/details/build2/config-vc.h
 create mode 100644 cutl/details/build2/config.h

(limited to 'cutl/details')

diff --git a/cutl/details/build2/config-vc.h b/cutl/details/build2/config-vc.h
new file mode 100644
index 0000000..a73781e
--- /dev/null
+++ b/cutl/details/build2/config-vc.h
@@ -0,0 +1,16 @@
+/* file      : cutl/details/build2/config-vc.h
+ * copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+ * license   : MIT; see accompanying LICENSE file
+ */
+
+/* Configuration file for Windows/VC++ for the build2 build. */
+
+#ifndef CUTL_DETAILS_CONFIG_VC_H
+#define CUTL_DETAILS_CONFIG_VC_H
+
+/* Define LIBCUTL_BUILD2 for the installed case. */
+#ifndef LIBCUTL_BUILD2
+#  define LIBCUTL_BUILD2
+#endif
+
+#endif /* CUTL_DETAILS_CONFIG_VC_H */
diff --git a/cutl/details/build2/config.h b/cutl/details/build2/config.h
new file mode 100644
index 0000000..f7547b6
--- /dev/null
+++ b/cutl/details/build2/config.h
@@ -0,0 +1,16 @@
+/* file      : cutl/details/build2/config.h
+ * copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+ * license   : MIT; see accompanying LICENSE file
+ */
+
+/* Static configuration file for the build2 build. */
+
+#ifndef CUTL_DETAILS_CONFIG_H
+#define CUTL_DETAILS_CONFIG_H
+
+/* Define LIBCUTL_BUILD2 for the installed case. */
+#ifndef LIBCUTL_BUILD2
+#  define LIBCUTL_BUILD2
+#endif
+
+#endif /* CUTL_DETAILS_CONFIG_H */
diff --git a/cutl/details/config.hxx b/cutl/details/config.hxx
index 8a4adc0..2d0ec8d 100644
--- a/cutl/details/config.hxx
+++ b/cutl/details/config.hxx
@@ -5,10 +5,18 @@
 #ifndef CUTL_DETAILS_CONFIG_HXX
 #define CUTL_DETAILS_CONFIG_HXX
 
-#ifdef _MSC_VER
-#  include <cutl/details/config-vc.h>
+#ifdef LIBCUTL_BUILD2
+#  ifdef _MSC_VER
+#    include <cutl/details/build2/config-vc.h>
+#  else
+#    include <cutl/details/build2/config.h>
+#  endif
 #else
-#  include <cutl/details/config.h>
+#  ifdef _MSC_VER
+#    include <cutl/details/config-vc.h>
+#  else
+#    include <cutl/details/config.h>
+#  endif
 #endif
 
 #endif // CUTL_DETAILS_CONFIG_HXX
diff --git a/cutl/details/export.hxx b/cutl/details/export.hxx
index f9f764f..c6c9f39 100644
--- a/cutl/details/export.hxx
+++ b/cutl/details/export.hxx
@@ -7,6 +7,43 @@
 
 #include <cutl/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 LIBCUTL_BUILD2
+
+#if defined(LIBCUTL_STATIC)         // Using static.
+#  define LIBCUTL_EXPORT
+#elif defined(LIBCUTL_STATIC_BUILD) // Building static.
+#  define LIBCUTL_EXPORT
+#elif defined(LIBCUTL_SHARED)       // Using shared.
+#  ifdef _WIN32
+#    define LIBCUTL_EXPORT __declspec(dllimport)
+#  else
+#    define LIBCUTL_EXPORT
+#  endif
+#elif defined(LIBCUTL_SHARED_BUILD) // Building shared.
+#  ifdef _WIN32
+#    define LIBCUTL_EXPORT __declspec(dllexport)
+#  else
+#    define LIBCUTL_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 LIBCUTL_EXPORT            // Using static or shared.
+#endif
+
+#else // LIBCUTL_BUILD2
+
 #ifdef LIBCUTL_STATIC_LIB
 #  define LIBCUTL_EXPORT
 #else
@@ -33,4 +70,6 @@
 #  endif
 #endif
 
+#endif // LIBCUTL_BUILD2
+
 #endif // CUTL_DETAILS_EXPORT_HXX
-- 
cgit v1.1