mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-09 20:50:43 +00:00
Windows build fix
This commit is contained in:
parent
ed3df8b773
commit
abf3330ae5
@ -5,7 +5,6 @@
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += core gui network xml
|
||||
#serialport
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION,4) {
|
||||
QT += widgets webkitwidgets
|
||||
@ -98,6 +97,9 @@ win32 {
|
||||
|
||||
HEADERS += build_number.h
|
||||
}
|
||||
|
||||
QT += serialport
|
||||
|
||||
}
|
||||
|
||||
unix {
|
||||
@ -296,11 +298,12 @@ contains(bundlelibs, true) {
|
||||
INCLUDEPATH += $$PWD/../3rdparty/quazip
|
||||
DEPENDPATH += $$PWD/../3rdparty/quazip
|
||||
|
||||
!win32 {
|
||||
include(../3rdparty/qtserialport/src/serialport/serialport-lib.pri)
|
||||
INCLUDEPATH += $$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
|
||||
|
||||
}
|
||||
} else {
|
||||
unix {
|
||||
message("Attempting to build with system quazip.");
|
||||
|
Loading…
Reference in New Issue
Block a user