diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-02-18 13:01:12 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-02-18 13:01:12 +0200 |
| commit | af50e2603fd0f877d0f96da1562b0deda0590b70 (patch) | |
| tree | c81af5e2565aca994aaf37b0bf6694c50cb52eee /odb/qt/details/config.hxx | |
| parent | d72ebf3ae3a638cefd8b11ae897eb491a19cac12 (diff) | |
Add support for building with build2
Diffstat (limited to 'odb/qt/details/config.hxx')
| -rw-r--r-- | odb/qt/details/config.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/odb/qt/details/config.hxx b/odb/qt/details/config.hxx index dbc4346..08030bd 100644 --- a/odb/qt/details/config.hxx +++ b/odb/qt/details/config.hxx @@ -7,8 +7,6 @@ // no pre -#ifdef _MSC_VER -#elif defined(ODB_COMPILER) // Qt5 may complain if we are building without -fPIC. Instead of asking the // user to pass one of these options to the ODB compiler (which can, BTW, be // done with -x -fPIC, for example, if one is not using the Qt profile), we @@ -20,6 +18,7 @@ // directly. This file appears to be present in all the versions starting with // Qt 4.0. // +#ifdef ODB_COMPILER # if defined(__ELF__) && !defined(__PIC__) # include <QtCore/qconfig.h> // QT_REDUCE_RELOCATIONS # ifdef QT_REDUCE_RELOCATIONS @@ -27,8 +26,12 @@ # endif # endif # define LIBODB_QT_STATIC_LIB -#else -# include <odb/qt/details/config.h> +#elif !defined(LIBODB_QT_BUILD2) +# ifdef _MSC_VER +# include <odb/qt/details/config-vc.h> +# else +# include <odb/qt/details/config.h> +# endif #endif // no post |