Commit 1df0c0d5 authored by LM's avatar LM

Windows build adjustments

parent 551701e8
...@@ -405,6 +405,10 @@ win32-g++ { ...@@ -405,6 +405,10 @@ win32-g++ {
CONFIG += CONSOLE CONFIG += CONSOLE
OUTPUT += CONSOLE OUTPUT += CONSOLE
# The EIGEN library needs this define
# to make the internal min/max functions work
DEFINES += NOMINMAX
INCLUDEPATH += $$BASEDIR/lib/sdl/include \ INCLUDEPATH += $$BASEDIR/lib/sdl/include \
$$BASEDIR/lib/opal/include #\ #\ $$BASEDIR/lib/opal/include #\ #\
#"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include" #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
......
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
#include <initguid.h> #include <initguid.h>
//#include "qextserialport.h" //#include "qextserialport.h"
#include <QRegExp> #include <QRegExp>
#ifdef Q_OS_WIN
#ifndef _MSC_VER
#include <windows.h>
#include <dbt.h>
#include <QtCore/qglobal.h>
#endif
#endif
QextSerialEnumerator::QextSerialEnumerator( ) QextSerialEnumerator::QextSerialEnumerator( )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment