From 6d44f821b4cf50c15b8bcd555005023a8a6a80ec Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 30 Aug 2016 16:50:01 +0200 Subject: Build infrastructure update --- hello/buildfile | 17 +++++++++++++++-- hello/export | 36 ++++++++++++++++++++++++++++++++++++ hello/hello | 4 +++- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 hello/export (limited to 'hello') diff --git a/hello/buildfile b/hello/buildfile index 4903a33..8331a7b 100644 --- a/hello/buildfile +++ b/hello/buildfile @@ -1,8 +1,21 @@ -lib{hello}: {hxx cxx}{hello} +lib{hello}: {hxx cxx}{hello} hxx{export} + +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. +# +if $abi_prerelease + lib{hello}: bin.lib.version = @-$version +else + lib{hello}: bin.lib.version = @-$abi_major.$abi_minor cxx.poptions += -I$src_root +obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD + lib{hello}: cxx.export.poptions = -I$src_root +liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC +libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED # Install into the hello/ subdirectory of, say, /usr/include/. # -install.include = $install.include/hello +install.include = $install.include/hello/ diff --git a/hello/export b/hello/export new file mode 100644 index 0000000..18f4968 --- /dev/null +++ b/hello/export @@ -0,0 +1,36 @@ +// file: hello/export -*- C++ -*- + +#pragma once + +// 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. + +#if defined(LIBHELLO_STATIC) // Using static. +# define LIBHELLO_EXPORT +#elif defined(LIBHELLO_STATIC_BUILD) // Building static. +# define LIBHELLO_EXPORT +#elif defined(LIBHELLO_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBHELLO_EXPORT __declspec(dllimport) +# else +# define LIBHELLO_EXPORT +# endif +#elif defined(LIBHELLO_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBHELLO_EXPORT __declspec(dllexport) +# else +# define LIBHELLO_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 LIBHELLO_EXPORT // Using static or shared. +#endif diff --git a/hello/hello b/hello/hello index 4f85114..5fb7d9e 100644 --- a/hello/hello +++ b/hello/hello @@ -4,8 +4,10 @@ #include +#include + namespace hello { - void + LIBHELLO_EXPORT void say (const std::string& name); } -- cgit v1.1