Integrated lppserial lib to lppmoncommon as a sub-repository.
Jeandet Alexis -
r19:dbff9217c66f default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -1,1 +1,2
1 src/SocExplorerEngine/PeripheralWidget = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget
1 src/SocExplorerEngine/PeripheralWidget = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget
2 src/common/lppserial = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/lppserial
@@ -1,1 +1,2
1 2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget
1 2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget
2 def3deb8bd342ad5cba9f7984f02f49f8d1df63e src/common/lppserial
@@ -11,6 +11,7 win32:CONFIG -= static
11 win32:INCLUDEPATH += $${PWD}/elf/libelfWin32/include
11 win32:INCLUDEPATH += $${PWD}/elf/libelfWin32/include
12 win32:INCLUDEPATH += $${PWD}/elf/libelfWin32/include/libelf
12 win32:INCLUDEPATH += $${PWD}/elf/libelfWin32/include/libelf
13 win32:DEFINES+=_ELF_WINDOWS_
13 win32:DEFINES+=_ELF_WINDOWS_
14 DEFINES+=RS232_debug
14
15
15 win32:LIBS += $${PWD}/elf/libelfWin32/bin/libelf.a
16 win32:LIBS += $${PWD}/elf/libelfWin32/bin/libelf.a
16 unix:LIBS += -lelf
17 unix:LIBS += -lelf
@@ -37,8 +38,8 header.files = \
37 elf/elfinfowdgt.h \
38 elf/elfinfowdgt.h \
38 elf/elfparser.h \
39 elf/elfparser.h \
39 elf/elffile.h \
40 elf/elffile.h \
40 qipdialogbox.h
41 qipdialogbox.h \
41
42 lppserial/src/RS232.h
42
43
43 win32{
44 win32{
44 elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/libelf
45 elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/libelf
@@ -82,7 +83,8 HEADERS += \
82 elf/elffile.h \
83 elf/elffile.h \
83 qipdialogbox.h \
84 qipdialogbox.h \
84 PySocExplorer.h \
85 PySocExplorer.h \
85 SocExplorerPlot.h
86 SocExplorerPlot.h \
87 lppserial/src/RS232.h
86
88
87
89
88 SOURCES += \
90 SOURCES += \
@@ -102,5 +104,8 SOURCES += \
102 qipdialogbox.cpp \
104 qipdialogbox.cpp \
103 SocExplorerPlot.cpp
105 SocExplorerPlot.cpp
104
106
107 unix:SOURCES += lppserial/src/RS232_unix.c
108 win32:SOURCES += lppserial/src/RS232_win.c
105
109
106
110
111
Comments 0
You need to be logged in to leave comments. Login now