diff options
| author | Tero Kontkanen <tero.kontkanen@granitedevices.fi> | 2017-05-29 22:30:25 +0300 |
|---|---|---|
| committer | Tero Kontkanen <tero.kontkanen@granitedevices.fi> | 2017-05-29 22:30:25 +0300 |
| commit | a60052b1d6a620e64d300f07e9edd26a963cd889 (patch) | |
| tree | d8fb151d39caf3816a795788bc16911d78dbae4e /SimpleMotionV2.pri | |
| parent | 53ad6bae709998e84d046e11966b4382ff1c0df9 (diff) | |
| parent | c2a59b64b486ced4dd91d4dba1005205322d6bc6 (diff) | |
| download | SimpleMotionV2-a60052b1d6a620e64d300f07e9edd26a963cd889.tar.gz SimpleMotionV2-a60052b1d6a620e64d300f07e9edd26a963cd889.zip | |
Merge branch 'feature/device-deployment-library' into develop
# Conflicts:
# SimpleMotionV2.pri - fixed
Diffstat (limited to 'SimpleMotionV2.pri')
| -rw-r--r-- | SimpleMotionV2.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SimpleMotionV2.pri b/SimpleMotionV2.pri index 79bfc56..8222018 100644 --- a/SimpleMotionV2.pri +++ b/SimpleMotionV2.pri @@ -6,9 +6,9 @@ DEPENDPATH += $$PWD DEFINES += SIMPLEMOTIONV2_LIBRARY
SOURCES += $$PWD/sm_consts.c $$PWD/simplemotion.c $$PWD/busdevice.c $$PWD/pcserialport.c \
- $$PWD/bufferedmotion.c $$PWD/tcpclient.c
+ $$PWD/bufferedmotion.c $$PWD/tcpclient.c $$PWD/devicedeployment.c
HEADERS += $$PWD/simplemotion_private.h\
$$PWD/pcserialport.h $$PWD/busdevice.h $$PWD/simplemotion.h $$PWD/sm485.h $$PWD/simplemotion_defs.h \
- $$PWD/bufferedmotion.h $$PWD/tcpclient.h
+ $$PWD/bufferedmotion.h $$PWD/tcpclient.h $$PWD/devicedeployment.h
|