diff options
| author | Tero Kontkanen <tero.kontkanen@granitedevices.fi> | 2017-02-23 00:57:24 +0200 |
|---|---|---|
| committer | Tero Kontkanen <tero.kontkanen@granitedevices.fi> | 2017-02-23 01:01:09 +0200 |
| commit | 8751d83576c4529607a02193585cff26e2e9f9ce (patch) | |
| tree | caa522f151681e58deaf3a710640dbc3a8aa55ac /SimpleMotionV2.pri | |
| parent | 81a6bba3d855f77b7185b99f77250d8572127d75 (diff) | |
| parent | 77972a62d6d04b3a8b1ad2def67fef06a48b4da0 (diff) | |
| download | SimpleMotionV2-8751d83576c4529607a02193585cff26e2e9f9ce.tar.gz SimpleMotionV2-8751d83576c4529607a02193585cff26e2e9f9ce.zip | |
Merge branch 'develop' into feature/BufferedMotionAPIfeature/BufferedMotionAPI
# Conflicts:
# SimpleMotionV2.pri
Diffstat (limited to 'SimpleMotionV2.pri')
| -rw-r--r-- | SimpleMotionV2.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SimpleMotionV2.pri b/SimpleMotionV2.pri index 9eeef0d..b5619bc 100644 --- a/SimpleMotionV2.pri +++ b/SimpleMotionV2.pri @@ -5,10 +5,10 @@ DEPENDPATH += $$PWD DEFINES += SIMPLEMOTIONV2_LIBRARY
-SOURCES += $$PWD/sm_consts.c $$PWD/simplemotion.c $$PWD/busdevice.c $$PWD/rs232.c \
+SOURCES += $$PWD/sm_consts.c $$PWD/simplemotion.c $$PWD/busdevice.c $$PWD/pcserialport.c \
$$PWD/bufferedmotion.c
HEADERS += $$PWD/simplemotion_private.h\
- $$PWD/rs232.h $$PWD/busdevice.h $$PWD/simplemotion.h $$PWD/sm485.h $$PWD/simplemotion_defs.h \
- ../SimpleMotionV2Library/bufferedmotion.h
+ $$PWD/pcserialport.h $$PWD/busdevice.h $$PWD/simplemotion.h $$PWD/sm485.h $$PWD/simplemotion_defs.h \
+ $$PWD/bufferedmotion.h
|