diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-03 11:22:44 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-04 23:32:57 +0100 |
| commit | 2b054e6135cbce030a642157dc1345f9dd42950b (patch) | |
| tree | bd0fd7b7c9ba0b31e45963c9bca5b7e60767b3bb | |
| parent | 4d2ce949b3b41f8bf0af446fa20205ddd229e579 (diff) | |
| download | rockbox-2b054e6135cbce030a642157dc1345f9dd42950b.zip rockbox-2b054e6135cbce030a642157dc1345f9dd42950b.tar.gz rockbox-2b054e6135cbce030a642157dc1345f9dd42950b.tar.bz2 rockbox-2b054e6135cbce030a642157dc1345f9dd42950b.tar.xz | |
Fix cutelogger with MSVC.
We're compiling cutelogger directly, not as DLL. Therefore we must not add
__declspec attributes to the header.
Change-Id: I41b87fd4ba34dfbcd0d37245ff1c1f279139bb33
| -rw-r--r-- | rbutil/rbutilqt/logger/CuteLogger_global.h | 4 | ||||
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/logger/CuteLogger_global.h b/rbutil/rbutilqt/logger/CuteLogger_global.h index 43e74af..c5e7680 100644 --- a/rbutil/rbutilqt/logger/CuteLogger_global.h +++ b/rbutil/rbutilqt/logger/CuteLogger_global.h @@ -3,10 +3,14 @@ #include <QtCore/qglobal.h> +#if !defined(CUTELOGGER_STATIC) #if defined(CUTELOGGER_LIBRARY) # define CUTELOGGERSHARED_EXPORT Q_DECL_EXPORT #else # define CUTELOGGERSHARED_EXPORT Q_DECL_IMPORT #endif +#else +#define CUTELOGGERSHARED_EXPORT +#endif #endif // CUTELOGGER_GLOBAL_H diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 4a4016c..00e0c87 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -153,7 +153,7 @@ dbg { message("release") } -DEFINES += RBUTIL _LARGEFILE64_SOURCE +DEFINES += RBUTIL _LARGEFILE64_SOURCE CUTELOGGER_STATIC # check version of Qt installation !contains(QT_MAJOR_VERSION, 5):!macx { |