From 852126e1bc9b95529738d3225a141552d72b8e04 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 3 Sep 2010 16:22:06 +0200 Subject: Add support for MinGW build --- odb/tracer/details/config.h.in | 14 ++++++++++++++ odb/tracer/details/config.hxx | 23 +++++++++++++++++++++++ odb/tracer/details/export.hxx | 20 +++++++++++++++++--- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 odb/tracer/details/config.h.in create mode 100644 odb/tracer/details/config.hxx (limited to 'odb/tracer/details') diff --git a/odb/tracer/details/config.h.in b/odb/tracer/details/config.h.in new file mode 100644 index 0000000..4e4d215 --- /dev/null +++ b/odb/tracer/details/config.h.in @@ -0,0 +1,14 @@ +/* file : odb/tracer/details/config.h.in + * author : Boris Kolpackov + * copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_TRACER_DETAILS_CONFIG_H +#define ODB_TRACER_DETAILS_CONFIG_H + +#undef LIBODB_TRACER_STATIC_LIB + +#endif /* ODB_TRACER_DETAILS_CONFIG_H */ diff --git a/odb/tracer/details/config.hxx b/odb/tracer/details/config.hxx new file mode 100644 index 0000000..d8e15b6 --- /dev/null +++ b/odb/tracer/details/config.hxx @@ -0,0 +1,23 @@ +// file : odb/tracer/details/config.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_TRACER_DETAILS_CONFIG_HXX +#define ODB_TRACER_DETAILS_CONFIG_HXX + +// no pre + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef LIBODB_TRACER_INCLUDE_SHORT + #ifdef _WIN32 + #define LIBODB_TRACER_INCLUDE_SHORT 1 + #endif +#endif + +// no post + +#endif // ODB_TRACER_DETAILS_CONFIG_HXX diff --git a/odb/tracer/details/export.hxx b/odb/tracer/details/export.hxx index 152a967..0bd43da 100644 --- a/odb/tracer/details/export.hxx +++ b/odb/tracer/details/export.hxx @@ -8,14 +8,28 @@ #include +#include + #ifdef LIBODB_TRACER_STATIC_LIB # define LIBODB_TRACER_EXPORT #else # ifdef _WIN32 -# ifdef LIBODB_TRACER_DYNAMIC_LIB -# define LIBODB_TRACER_EXPORT __declspec(dllexport) +# ifdef _MSC_VER +# ifdef LIBODB_TRACER_DYNAMIC_LIB +# define LIBODB_TRACER_EXPORT __declspec(dllexport) +# else +# define LIBODB_TRACER_EXPORT __declspec(dllimport) +# endif # else -# define LIBODB_TRACER_EXPORT __declspec(dllimport) +# ifdef LIBODB_TRACER_DYNAMIC_LIB +# ifdef DLL_EXPORT +# define LIBODB_TRACER_EXPORT __declspec(dllexport) +# else +# define LIBODB_TRACER_EXPORT +# endif +# else +# define LIBODB_TRACER_EXPORT __declspec(dllimport) +# endif # endif # else # define LIBODB_TRACER_EXPORT -- cgit v1.1