chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-18 03:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows build fix

Browse Source
This commit is contained in:
Mark Watkins 2014-07-21 02:49:28 +10:00
parent ed3df8b773
commit abf3330ae5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleepyhead/sleepyhead.pro
View File

@ -5,7 +5,6 @@
#------------------------------------------------- #-------------------------------------------------
QT += core gui network xml QT += core gui network xml
#serialport
greaterThan(QT_MAJOR_VERSION,4) { greaterThan(QT_MAJOR_VERSION,4) {
QT += widgets webkitwidgets QT += widgets webkitwidgets
@ -98,6 +97,9 @@ win32 {
HEADERS += build_number.h HEADERS += build_number.h
} }
QT += serialport
} }
unix { unix {
@ -296,11 +298,12 @@ contains(bundlelibs, true) {
INCLUDEPATH += $$PWD/../3rdparty/quazip INCLUDEPATH += $$PWD/../3rdparty/quazip
DEPENDPATH += $$PWD/../3rdparty/quazip DEPENDPATH += $$PWD/../3rdparty/quazip
!win32 {
include(../3rdparty/qtserialport/src/serialport/serialport-lib.pri) include(../3rdparty/qtserialport/src/serialport/serialport-lib.pri)
INCLUDEPATH += $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort INCLUDEPATH += $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort
DEPENDPATH += $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort DEPENDPATH += $$PWD/../3rdparty/qtserialport/include/QtSerialPort/5.3.1/QtSerialPort
# DEPENDPATH += $$PWD/../3rdparty/qtserialport/src/serialport/include/QtSerialPort/5.3.1 # DEPENDPATH += $$PWD/../3rdparty/qtserialport/src/serialport/include/QtSerialPort/5.3.1
}
} else { } else {
unix { unix {
message("Attempting to build with system quazip."); message("Attempting to build with system quazip.");