From 823f53f89963bde6e6d57e58348f8242fda2cdd9 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 29 Apr 2017 16:18:46 +0300 Subject: Add hxx extension for headers and lib prefix for library dirs --- format/buildfile | 21 --------------------- format/export | 36 ------------------------------------ format/format | 10 ---------- format/format.cxx | 11 ----------- 4 files changed, 78 deletions(-) delete mode 100644 format/buildfile delete mode 100644 format/export delete mode 100644 format/format delete mode 100644 format/format.cxx (limited to 'format') diff --git a/format/buildfile b/format/buildfile deleted file mode 100644 index e84af47..0000000 --- a/format/buildfile +++ /dev/null @@ -1,21 +0,0 @@ -lib{format}: {hxx cxx}{format} 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 $version.pre_release - lib{format}: bin.lib.version = @"-$version.project_id" -else - lib{format}: bin.lib.version = @"-$version.major.$version.minor" - -cxx.poptions =+ "-I$out_root" "-I$src_root" -obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD - -lib{format}: cxx.export.poptions = "-I$out_root" "-I$src_root" -liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC -libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED - -# Install into the format/ subdirectory of, say, /usr/include/. -# -install.include = $install.include/format/ diff --git a/format/export b/format/export deleted file mode 100644 index 39a37da..0000000 --- a/format/export +++ /dev/null @@ -1,36 +0,0 @@ -// file: format/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(LIBFORMAT_STATIC) // Using static. -# define LIBFORMAT_EXPORT -#elif defined(LIBFORMAT_STATIC_BUILD) // Building static. -# define LIBFORMAT_EXPORT -#elif defined(LIBFORMAT_SHARED) // Using shared. -# ifdef _WIN32 -# define LIBFORMAT_EXPORT __declspec(dllimport) -# else -# define LIBFORMAT_EXPORT -# endif -#elif defined(LIBFORMAT_SHARED_BUILD) // Building shared. -# ifdef _WIN32 -# define LIBFORMAT_EXPORT __declspec(dllexport) -# else -# define LIBFORMAT_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 LIBFORMAT_EXPORT // Using static or shared. -#endif diff --git a/format/format b/format/format deleted file mode 100644 index 69350b0..0000000 --- a/format/format +++ /dev/null @@ -1,10 +0,0 @@ -// file: format/format -*- C++ -*- - -#pragma once - -#include - -#include - -LIBFORMAT_EXPORT std::string -format (const std::string& greeting, const std::string& name); diff --git a/format/format.cxx b/format/format.cxx deleted file mode 100644 index 0566e78..0000000 --- a/format/format.cxx +++ /dev/null @@ -1,11 +0,0 @@ -// file: format/format.cxx -*- C++ -*- - -#include - -using namespace std; - -string -format (const string& g, const string& n) -{ - return g + ", " + n + '!'; -} -- cgit v1.1