Start work on building on Windows with DLL's

This commit is contained in:
Justin Hammond 2019-08-22 17:50:27 +08:00
parent dbd13ea3bb
commit 2a185b54de
11 changed files with 27 additions and 1 deletions

View file

@ -34,3 +34,14 @@ unix {
} }
} }
win32 {
exists( $$top_srcdir/../open-zwave/cpp/src/) {
message("Found OZW in $$absolute_path($$top_srcdir/../open-zwave/cpp/src)")
OZW_LIB_PATH = $$absolute_path($$top_srcdir/../open-zwave/)
INCLUDEPATH += $$absolute_path($$top_srcdir/../open-zwave/cpp/src/)/
LIBS += -L$$absolute_path($$top_srcdir/../open-zwave/cpp/build/windows/vs2010/ReleaseDLL) -lopenzwave
} else {
error("Can't Find a copy of OpenZwave")
}
}

View file

@ -34,6 +34,7 @@
# define QTOPENZWAVESHARED_EXPORT Q_DECL_EXPORT # define QTOPENZWAVESHARED_EXPORT Q_DECL_EXPORT
#else #else
# define QTOPENZWAVESHARED_EXPORT Q_DECL_IMPORT # define QTOPENZWAVESHARED_EXPORT Q_DECL_IMPORT
# define OPENZWAVE_USEDLL
#endif #endif
#endif // QTOPENZWAVE_GLOBAL_H #endif // QTOPENZWAVE_GLOBAL_H

View file

@ -25,6 +25,7 @@
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "qt-openzwave_global.h"
#include <QLoggingCategory> #include <QLoggingCategory>
#ifndef QTOZW_LOGGING_H #ifndef QTOZW_LOGGING_H

View file

@ -28,6 +28,7 @@
#ifndef QTOZWASSOCIATIONMODEL_P_H #ifndef QTOZWASSOCIATIONMODEL_P_H
#define QTOZWASSOCIATIONMODEL_P_H #define QTOZWASSOCIATIONMODEL_P_H
#include "qt-openzwave_global.h"
#include <QObject> #include <QObject>
#include "qt-openzwave/qtozwassociationmodel.h" #include "qt-openzwave/qtozwassociationmodel.h"

View file

@ -27,6 +27,7 @@
#ifndef QTOZW_LOG_P_H #ifndef QTOZW_LOG_P_H
#define QTOZW_LOG_P_H #define QTOZW_LOG_P_H
#include "qt-openzwave_global.h"
#include "qt-openzwave/qtozwlog.h" #include "qt-openzwave/qtozwlog.h"
#include <platform/Log.h> #include <platform/Log.h>

View file

@ -29,6 +29,8 @@
#ifndef QTOZWMANAGER_P_H #ifndef QTOZWMANAGER_P_H
#define QTOZWMANAGER_P_H #define QTOZWMANAGER_P_H
#include "qt-openzwave_global.h"
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>
#include "qtozw_logging.h" #include "qtozw_logging.h"

View file

@ -28,6 +28,8 @@
#ifndef QTOZWNODEMODEL_P_H #ifndef QTOZWNODEMODEL_P_H
#define QTOZWNODEMODEL_P_H #define QTOZWNODEMODEL_P_H
#include "qt-openzwave_global.h"
#include <QObject> #include <QObject>
#include "qt-openzwave/qtozwnodemodel.h" #include "qt-openzwave/qtozwnodemodel.h"

View file

@ -28,6 +28,8 @@
#ifndef QTOZWNOTIFICATION_H #ifndef QTOZWNOTIFICATION_H
#define QTOZWNOTIFICATION_H #define QTOZWNOTIFICATION_H
#include "qt-openzwave_global.h"
#include <QObject> #include <QObject>
#include "Notification.h" #include "Notification.h"

View file

@ -28,6 +28,8 @@
#ifndef QTOZWOPTIONS_P_H #ifndef QTOZWOPTIONS_P_H
#define QTOZWOPTIONS_P_H #define QTOZWOPTIONS_P_H
#include "qt-openzwave_global.h"
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>
#include <Options.h> #include <Options.h>

View file

@ -28,6 +28,8 @@
#ifndef QTOZWVALUEIDMODEL_P_H #ifndef QTOZWVALUEIDMODEL_P_H
#define QTOZWVALUEIDMODEL_P_H #define QTOZWVALUEIDMODEL_P_H
#include "qt-openzwave_global.h"
#include <QObject> #include <QObject>
#include "qt-openzwave/qtozwvalueidmodel.h" #include "qt-openzwave/qtozwvalueidmodel.h"

View file

@ -24,8 +24,9 @@
// along with OpenZWave. If not, see <http://www.gnu.org/licenses/>. // along with OpenZWave. If not, see <http://www.gnu.org/licenses/>.
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef WIN32
#include <unistd.h> #include <unistd.h>
#endif
#include <QDebug> #include <QDebug>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QAbstractItemModelReplica> #include <QAbstractItemModelReplica>