Skip to content

Commit 0f4b7f3

Browse files
committed
Ready to realize
1 parent c5a8ece commit 0f4b7f3

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

Serial

ShellerTerminal.pro

+14-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,11 @@ CONFIG += c++11
99
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
1010

1111
SOURCES += \
12-
../../Libs/serial/serial.cpp \
13-
../../Libs/sheller/Source/crc.c \
14-
../../Libs/sheller/Source/sheller.c \
1512
core.cpp \
1613
main.cpp \
1714
mainwindow.cpp
1815

1916
HEADERS += \
20-
../../Libs/serial/serial.h \
21-
../../Libs/sheller/Source/crc.h \
22-
../../Libs/sheller/Source/sheller.h \
2317
core.h \
2418
mainwindow.h
2519

@@ -30,3 +24,17 @@ FORMS += \
3024
qnx: target.path = /tmp/$${TARGET}/bin
3125
else: unix:!android: target.path = /opt/$${TARGET}/bin
3226
!isEmpty(target.path): INSTALLS += target
27+
28+
# Serial as external static library
29+
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../Libs/serial/build/release/ -lserial
30+
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../Libs/serial/build/debug/ -lserial
31+
else:unix: LIBS += -L$$PWD/../../Libs/serial/build/ -lserial
32+
33+
INCLUDEPATH += $$PWD/../../Libs/serial
34+
DEPENDPATH += $$PWD/../../Libs/serial
35+
36+
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../Libs/serial/build/release/libserial.a
37+
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../Libs/serial/build/debug/libserial.a
38+
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../Libs/serial/build/release/serial.lib
39+
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../Libs/serial/build/debug/serial.lib
40+
else:unix: PRE_TARGETDEPS += $$PWD/../../Libs/serial/build/libserial.a

core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <QThread>
77
#include <QObject>
88

9-
#include "../../Libs/serial/serial.h"
9+
#include "serial.h"
1010

1111
class Core : public QObject
1212
{

0 commit comments

Comments
 (0)