From: haruyukilxz Date: Thu, 26 Apr 2018 14:42:13 +0000 (+0800) Subject: fix: add LIBDTKCORESHARED_EXPORT for windows X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~118^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6fb1096f6d0784937cf84f0e4ae1f5f7587085e5;p=dtkcore.git fix: add LIBDTKCORESHARED_EXPORT for windows Change-Id: Idd83445bf1c042cdc4532f3d3820f18d0a5edf8f --- diff --git a/src/filesystem/dbasefilewatcher.h b/src/filesystem/dbasefilewatcher.h index b8cea9f..bbd2aa9 100644 --- a/src/filesystem/dbasefilewatcher.h +++ b/src/filesystem/dbasefilewatcher.h @@ -26,7 +26,7 @@ DCORE_BEGIN_NAMESPACE class DBaseFileWatcherPrivate; -class DBaseFileWatcher : public QObject, public DObject +class LIBDTKCORESHARED_EXPORT DBaseFileWatcher : public QObject, public DObject { Q_OBJECT diff --git a/src/filesystem/dfilesystemwatcher.h b/src/filesystem/dfilesystemwatcher.h index 2b505ab..a224b2d 100644 --- a/src/filesystem/dfilesystemwatcher.h +++ b/src/filesystem/dfilesystemwatcher.h @@ -26,7 +26,7 @@ DCORE_BEGIN_NAMESPACE class DFileSystemWatcherPrivate; -class DFileSystemWatcher : public QObject, public DObject +class LIBDTKCORESHARED_EXPORT DFileSystemWatcher : public QObject, public DObject { Q_OBJECT D_DECLARE_PRIVATE(DFileSystemWatcher) diff --git a/src/filesystem/dfilewatcher.h b/src/filesystem/dfilewatcher.h index fb44d01..9ac77d7 100644 --- a/src/filesystem/dfilewatcher.h +++ b/src/filesystem/dfilewatcher.h @@ -23,7 +23,7 @@ DCORE_BEGIN_NAMESPACE class DFileWatcherPrivate; -class DFileWatcher : public DBaseFileWatcher +class LIBDTKCORESHARED_EXPORT DFileWatcher : public DBaseFileWatcher { Q_OBJECT diff --git a/src/filesystem/dfilewatchermanager.h b/src/filesystem/dfilewatchermanager.h index 190479e..e41582b 100644 --- a/src/filesystem/dfilewatchermanager.h +++ b/src/filesystem/dfilewatchermanager.h @@ -28,7 +28,7 @@ DCORE_BEGIN_NAMESPACE class DFileWatcher; class DFileWatcherManagerPrivate; -class DFileWatcherManager : public QObject, public DObject +class LIBDTKCORESHARED_EXPORT DFileWatcherManager : public QObject, public DObject { Q_OBJECT diff --git a/src/filesystem/dpathbuf.cpp b/src/filesystem/dpathbuf.cpp new file mode 100644 index 0000000..9fe11b2 --- /dev/null +++ b/src/filesystem/dpathbuf.cpp @@ -0,0 +1,6 @@ +#include "dpathbuf.h" + +Dtk::Core::DPathBuf::DPathBuf(const QString &path) +{ + m_path = QDir(path).absolutePath(); +} diff --git a/src/filesystem/dpathbuf.h b/src/filesystem/dpathbuf.h index 499dc11..3aa7609 100644 --- a/src/filesystem/dpathbuf.h +++ b/src/filesystem/dpathbuf.h @@ -23,13 +23,10 @@ DCORE_BEGIN_NAMESPACE -class DPathBuf +class LIBDTKCORESHARED_EXPORT DPathBuf { public: - DPathBuf(const QString &path) - { - m_path = QDir(path).absolutePath(); - } + DPathBuf(const QString &path); DPathBuf operator/(const QString &p) const { diff --git a/src/filesystem/dstandardpaths.h b/src/filesystem/dstandardpaths.h index c749cae..491b31f 100644 --- a/src/filesystem/dstandardpaths.h +++ b/src/filesystem/dstandardpaths.h @@ -25,7 +25,7 @@ DCORE_BEGIN_NAMESPACE class DStandardPathsPrivate; -class DStandardPaths +class LIBDTKCORESHARED_EXPORT DStandardPaths { public: enum Mode { diff --git a/src/filesystem/filesystem.pri b/src/filesystem/filesystem.pri index d0e67f6..c8d81a0 100644 --- a/src/filesystem/filesystem.pri +++ b/src/filesystem/filesystem.pri @@ -14,8 +14,8 @@ SOURCES += \ $$PWD/dbasefilewatcher.cpp \ $$PWD/dfilewatcher.cpp \ $$PWD/dfilewatchermanager.cpp \ - $$PWD/dstandardpaths.cpp - + $$PWD/dstandardpaths.cpp \ + $$PWD/dpathbuf.cpp linux { SOURCES += \ diff --git a/src/log/LogManager.h b/src/log/LogManager.h index c79b582..689cb23 100644 --- a/src/log/LogManager.h +++ b/src/log/LogManager.h @@ -27,7 +27,7 @@ DCORE_BEGIN_NAMESPACE class ConsoleAppender; class RollingFileAppender; -class DLogManager +class LIBDTKCORESHARED_EXPORT DLogManager { public: static void registerConsoleAppender(); diff --git a/src/settings/backend/gsettingsbackend.h b/src/settings/backend/gsettingsbackend.h index 5fd92f7..94abdc0 100644 --- a/src/settings/backend/gsettingsbackend.h +++ b/src/settings/backend/gsettingsbackend.h @@ -8,7 +8,7 @@ DCORE_BEGIN_NAMESPACE class GSettingsBackendPrivate; -class GSettingsBackend: public DSettingsBackend +class LIBDTKCORESHARED_EXPORT GSettingsBackend: public DSettingsBackend { Q_OBJECT public: diff --git a/src/settings/backend/qsettingbackend.h b/src/settings/backend/qsettingbackend.h index 643d05e..1388d90 100644 --- a/src/settings/backend/qsettingbackend.h +++ b/src/settings/backend/qsettingbackend.h @@ -25,7 +25,7 @@ DCORE_BEGIN_NAMESPACE class QSettingBackendPrivate; -class QSettingBackend : public Dtk::Core::DSettingsBackend +class LIBDTKCORESHARED_EXPORT QSettingBackend : public Dtk::Core::DSettingsBackend { Q_OBJECT public: diff --git a/src/settings/dsettings.h b/src/settings/dsettings.h index c8a8dfa..e955444 100644 --- a/src/settings/dsettings.h +++ b/src/settings/dsettings.h @@ -29,7 +29,7 @@ class DSettingsBackend; class DSettingsOption; class DSettingsGroup; class DSettingsPrivate; -class DSettings : public QObject +class LIBDTKCORESHARED_EXPORT DSettings : public QObject { Q_OBJECT public: diff --git a/src/settings/dsettingsbackend.h b/src/settings/dsettingsbackend.h index 9c08ab5..d4e7889 100644 --- a/src/settings/dsettingsbackend.h +++ b/src/settings/dsettingsbackend.h @@ -25,7 +25,7 @@ DCORE_BEGIN_NAMESPACE class DSettings; -class DSettingsBackend : public QObject +class LIBDTKCORESHARED_EXPORT DSettingsBackend : public QObject { Q_OBJECT public: diff --git a/src/settings/dsettingsgroup.h b/src/settings/dsettingsgroup.h index 323a1ce..b11a942 100644 --- a/src/settings/dsettingsgroup.h +++ b/src/settings/dsettingsgroup.h @@ -27,7 +27,7 @@ DCORE_BEGIN_NAMESPACE class DSettingsGroupPrivate; -class DSettingsGroup : public QObject +class LIBDTKCORESHARED_EXPORT DSettingsGroup : public QObject { Q_OBJECT public: diff --git a/src/settings/dsettingsoption.h b/src/settings/dsettingsoption.h index c1ccbfe..0087c0d 100644 --- a/src/settings/dsettingsoption.h +++ b/src/settings/dsettingsoption.h @@ -27,7 +27,7 @@ DCORE_BEGIN_NAMESPACE class DSettingsGroup; class DSettingsOptionPrivate; -class DSettingsOption : public QObject +class LIBDTKCORESHARED_EXPORT DSettingsOption : public QObject { Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) diff --git a/src/src.pro b/src/src.pro index 2414e87..b198292 100644 --- a/src/src.pro +++ b/src/src.pro @@ -80,6 +80,12 @@ includes.files += $$PWD/*.h $$PWD/dtkcore_config.h $$PWD/DtkCore INSTALLS += includes target +isEmpty(DTK_STATIC_LIB){ + DEFINES += LIBDTKCORE_LIBRARY +} else { + DEFINES += DTK_STATIC_LIB +} + #cmake include(dtk_cmake.prf) diff --git a/src/util/dabstractunitformatter.h b/src/util/dabstractunitformatter.h index 395cb0a..30c6e2e 100644 --- a/src/util/dabstractunitformatter.h +++ b/src/util/dabstractunitformatter.h @@ -25,7 +25,7 @@ DCORE_BEGIN_NAMESPACE -class DAbstractUnitFormatter +class LIBDTKCORESHARED_EXPORT DAbstractUnitFormatter { public: DAbstractUnitFormatter(); diff --git a/src/util/ddbussender.h b/src/util/ddbussender.h index 67e76f7..25cb6c6 100644 --- a/src/util/ddbussender.h +++ b/src/util/ddbussender.h @@ -1,6 +1,8 @@ #ifndef DDBUSSENDER_H #define DDBUSSENDER_H +#include "dtkcore_global.h" + #include #include #include @@ -8,7 +10,7 @@ #include -class DDBusData +class LIBDTKCORESHARED_EXPORT DDBusData { public: DDBusData(); @@ -20,7 +22,7 @@ public: QDBusConnection connection; }; -class DDBusCaller +class LIBDTKCORESHARED_EXPORT DDBusCaller { friend class DDBusSender; @@ -47,7 +49,7 @@ DDBusCaller DDBusCaller::arg(const T &argument) return *this; } -class DDBusProperty +class LIBDTKCORESHARED_EXPORT DDBusProperty { friend class DDBusSender; @@ -74,7 +76,7 @@ QDBusPendingCall DDBusProperty::set(const T &value) return iface.asyncCallWithArgumentList(QStringLiteral("Set"), args); } -class DDBusSender +class LIBDTKCORESHARED_EXPORT DDBusSender { public: explicit DDBusSender(); diff --git a/src/util/ddisksizeformatter.h b/src/util/ddisksizeformatter.h index de7d7d7..6ff5121 100644 --- a/src/util/ddisksizeformatter.h +++ b/src/util/ddisksizeformatter.h @@ -22,7 +22,7 @@ DCORE_BEGIN_NAMESPACE -class DDiskSizeFormatter : public DAbstractUnitFormatter +class LIBDTKCORESHARED_EXPORT DDiskSizeFormatter : public DAbstractUnitFormatter { public: DDiskSizeFormatter(); diff --git a/src/util/dtimeunitformatter.h b/src/util/dtimeunitformatter.h index 3c71bb8..9039848 100644 --- a/src/util/dtimeunitformatter.h +++ b/src/util/dtimeunitformatter.h @@ -18,11 +18,12 @@ #ifndef DTIMEUNITFORMATTER_H #define DTIMEUNITFORMATTER_H +#include "dtkcore_global.h" #include "dabstractunitformatter.h" DCORE_BEGIN_NAMESPACE -class DTimeUnitFormatter : public DAbstractUnitFormatter +class LIBDTKCORESHARED_EXPORT DTimeUnitFormatter : public DAbstractUnitFormatter { public: DTimeUnitFormatter();