##// END OF EJS Templates
Updated generic binary files support.
Jeandet Alexis -
r63:064c21e6b525 default
parent child
Show More
@@ -1,4 +1,4
1 2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget
1 2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget
2 792782cb7421744ce931903441bc006e6afe0114 src/common/genericBinaryFiles
2 e0f25227d6283e833fbb70c5fc1bdc6c3ca8060e src/common/genericBinaryFiles
3 2dce25b198558be573f56c1cf337aa95ddd666d6 src/common/lppserial
3 2dce25b198558be573f56c1cf337aa95ddd666d6 src/common/lppserial
4 a4274329c9f05c742b3eb9753e77c47d27e838e9 src/common/qhexedit
4 a4274329c9f05c742b3eb9753e77c47d27e838e9 src/common/qhexedit
@@ -1,138 +1,147
1 SOCEXPLORER_ROOT = \"$${PWD}/../..\"
1 SOCEXPLORER_ROOT = \"$${PWD}/../..\"
2 include($${PWD}/../../build_cfg/socexplorer.pri)
2 include($${PWD}/../../build_cfg/socexplorer.pri)
3 include($${PWD}/lppserial/lppserial.pri)
3 include($${PWD}/lppserial/lppserial.pri)
4
4
5 TEMPLATE = lib
5 TEMPLATE = lib
6 TARGET = socexplorercommon$${DEBUG_EXT}
6 TARGET = socexplorercommon$${DEBUG_EXT}
7
7
8 win32:CONFIG += dll
8 win32:CONFIG += dll
9 win32:CONFIG -= static
9 win32:CONFIG -= static
10
10
11 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include
11 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include
12 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf
12 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf
13 win32:DEFINES+=_ELF_WINDOWS_
13 win32:DEFINES+=_ELF_WINDOWS_
14 DEFINES+=RS232_debug
14 DEFINES+=RS232_debug
15
15
16 win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a
16 win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a
17 unix:LIBS += -lelf
17 unix:LIBS += -lelf
18
18
19 QMAKE_LFLAGS_RELEASE += --enable-auto-import
19 QMAKE_LFLAGS_RELEASE += --enable-auto-import
20 QMAKE_LFLAGS_DEBUG += --enable-auto-import
20 QMAKE_LFLAGS_DEBUG += --enable-auto-import
21
21
22 target.path = $$[QT_INSTALL_LIBS]
22 target.path = $$[QT_INSTALL_LIBS]
23 isEmpty(target.path) {
23 isEmpty(target.path) {
24 error(can\'t get QT_INSTALL_LIBS)
24 error(can\'t get QT_INSTALL_LIBS)
25 }
25 }
26
26
27 header.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common
27 header.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common
28 header.files = \
28 header.files = \
29 memsizewdgt.h \
29 memsizewdgt.h \
30 qhexspinbox.h \
30 qhexspinbox.h \
31 qsvgicon.h \
31 qsvgicon.h \
32 qhexedit/qhexedit_p.h \
32 qhexedit/qhexedit_p.h \
33 qhexedit/qhexedit.h \
33 qhexedit/qhexedit.h \
34 qhexedit/xbytearray.h \
34 qhexedit/xbytearray.h \
35 QCustomPlot/qcustomplot.h \
35 QCustomPlot/qcustomplot.h \
36 SocExplorerPlot.h \
36 SocExplorerPlot.h \
37 tcp_terminal_client.h \
37 tcp_terminal_client.h \
38 genericBinaryFiles/elf/elfinfowdgt.h \
38 genericBinaryFiles/elf/elfinfowdgt.h \
39 genericBinaryFiles/elf/elfparser.h \
39 genericBinaryFiles/elf/elfparser.h \
40 genericBinaryFiles/elf/elffile.h \
40 genericBinaryFiles/elf/elffile.h \
41 genericBinaryFiles/elf/elffilewidget.h \
41 genericBinaryFiles/elf/elffilewidget.h \
42 qipdialogbox.h \
42 qipdialogbox.h \
43 lppserial/src/RS232.h \
43 lppserial/src/RS232.h \
44 qtablewidgetintitem.h \
44 qtablewidgetintitem.h \
45 genericBinaryFiles/srec/srecfile.h \
45 genericBinaryFiles/srec/srecfile.h \
46 genericBinaryFiles/srec/srecfilewidget.h \
46 genericBinaryFiles/srec/srecfilewidget.h \
47 genericBinaryFiles/BinFile/binaryfile.h \
47 genericBinaryFiles/BinFile/binaryfile.h \
48 genericBinaryFiles/BinFile/binaryfilewidget.h \
48 genericBinaryFiles/BinFile/binaryfilewidget.h \
49 genericBinaryFiles/abstractbinfile.h
49 genericBinaryFiles/abstractbinfile.h \
50 genericBinaryFiles/qvpushbutton.h \
51 genericBinaryFiles/qtablewidgetintitem.h \
52 genericBinaryFiles/filelist.h
50
53
51 win32{
54 win32{
52 elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/genericBinaryFiles/libelf
55 elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/genericBinaryFiles/libelf
53 elfheader.files += \
56 elfheader.files += \
54 genericBinaryFiles/elf/libelfWin32/include/libelf/byteswap.h \
57 genericBinaryFiles/elf/libelfWin32/include/libelf/byteswap.h \
55 genericBinaryFiles/elf/libelfWin32/include/libelf/errors.h \
58 genericBinaryFiles/elf/libelfWin32/include/libelf/errors.h \
56 genericBinaryFiles/elf/libelfWin32/include/libelf/gelf.h \
59 genericBinaryFiles/elf/libelfWin32/include/libelf/gelf.h \
57 genericBinaryFiles/elf/libelfWin32/include/libelf/nlist.h \
60 genericBinaryFiles/elf/libelfWin32/include/libelf/nlist.h \
58 genericBinaryFiles/elf/libelfWin32/include/libelf/sys_elf.h \
61 genericBinaryFiles/elf/libelfWin32/include/libelf/sys_elf.h \
59 genericBinaryFiles/elf/libelfWin32/include/libelf/verneed.h \
62 genericBinaryFiles/elf/libelfWin32/include/libelf/verneed.h \
60 genericBinaryFiles/elf/libelfWin32/include/libelf/elf_repl.h \
63 genericBinaryFiles/elf/libelfWin32/include/libelf/elf_repl.h \
61 genericBinaryFiles/elf/libelfWin32/include/libelf/ext_types.h \
64 genericBinaryFiles/elf/libelfWin32/include/libelf/ext_types.h \
62 genericBinaryFiles/elf/libelfWin32/include/libelf/libelf.h \
65 genericBinaryFiles/elf/libelfWin32/include/libelf/libelf.h \
63 genericBinaryFiles/elf/libelfWin32/include/libelf/private.h \
66 genericBinaryFiles/elf/libelfWin32/include/libelf/private.h \
64 genericBinaryFiles/elf/libelfWin32/include/libelf/verdef.h
67 genericBinaryFiles/elf/libelfWin32/include/libelf/verdef.h
65 INSTALLS += elfheader
68 INSTALLS += elfheader
66 }
69 }
67
70
68
71
69 isEmpty(header.path) {
72 isEmpty(header.path) {
70 error(can\'t get QT_INSTALL_HEADERS)
73 error(can\'t get QT_INSTALL_HEADERS)
71 }
74 }
72
75
73 INSTALLS += target header
76 INSTALLS += target header
74
77
75 INCLUDEPATH += QCustomPlot qhexedit genericBinaryFiles genericBinaryFiles/srec genericBinaryFiles/BinFile
78 INCLUDEPATH += QCustomPlot qhexedit genericBinaryFiles genericBinaryFiles/srec genericBinaryFiles/BinFile
76
79
77 HEADERS += \
80 HEADERS += \
78 memsizewdgt.h \
81 memsizewdgt.h \
79 qhexspinbox.h \
82 qhexspinbox.h \
80 qsvgicon.h \
83 qsvgicon.h \
81 qhexedit/qhexedit_p.h \
84 qhexedit/qhexedit_p.h \
82 qhexedit/qhexedit.h \
85 qhexedit/qhexedit.h \
83 qhexedit/xbytearray.h \
86 qhexedit/xbytearray.h \
84 qhexedit/commands.h \
87 qhexedit/commands.h \
85 QCustomPlot/qcustomplot.h \
88 QCustomPlot/qcustomplot.h \
86 tcp_terminal_client.h \
89 tcp_terminal_client.h \
87 genericBinaryFiles/elf/elfinfowdgt.h \
90 genericBinaryFiles/elf/elfinfowdgt.h \
88 genericBinaryFiles/elf/elfparser.h \
91 genericBinaryFiles/elf/elfparser.h \
89 genericBinaryFiles/elf/elffile.h \
92 genericBinaryFiles/elf/elffile.h \
90 qipdialogbox.h \
93 qipdialogbox.h \
91 PySocExplorer.h \
94 PySocExplorer.h \
92 SocExplorerPlot.h \
95 SocExplorerPlot.h \
93 genericBinaryFiles/elf/elffilewidget.h \
96 genericBinaryFiles/elf/elffilewidget.h \
94 genericBinaryFiles/srec/srecfile.h \
97 genericBinaryFiles/srec/srecfile.h \
95 genericBinaryFiles/srec/srecfilewidget.h \
98 genericBinaryFiles/srec/srecfilewidget.h \
96 genericBinaryFiles/abstractbinfile.h \
99 genericBinaryFiles/abstractbinfile.h \
97 genericBinaryFiles/BinFile/binaryfile.h \
100 genericBinaryFiles/BinFile/binaryfile.h \
98 genericBinaryFiles/BinFile/binaryfilewidget.h \
101 genericBinaryFiles/BinFile/binaryfilewidget.h \
99 genericBinaryFiles/genericbinaryfilewidget.h
102 genericBinaryFiles/genericbinaryfilewidget.h \
103 genericBinaryFiles/qvpushbutton.h \
104 genericBinaryFiles/qtablewidgetintitem.h \
105 genericBinaryFiles/filelist.h
100
106
101
107
102 SOURCES += \
108 SOURCES += \
103 memsizewdgt.cpp \
109 memsizewdgt.cpp \
104 qhexspinbox.cpp \
110 qhexspinbox.cpp \
105 qsvgicon.cpp \
111 qsvgicon.cpp \
106 qhexedit/qhexedit_p.cpp \
112 qhexedit/qhexedit_p.cpp \
107 qhexedit/qhexedit.cpp \
113 qhexedit/qhexedit.cpp \
108 qhexedit/xbytearray.cpp \
114 qhexedit/xbytearray.cpp \
109 qhexedit/commands.cpp \
115 qhexedit/commands.cpp \
110 QCustomPlot/qcustomplot.cpp \
116 QCustomPlot/qcustomplot.cpp \
111 tcp_terminal_client.cpp \
117 tcp_terminal_client.cpp \
112 genericBinaryFiles/elf/elfinfowdgt.cpp \
118 genericBinaryFiles/elf/elfinfowdgt.cpp \
113 genericBinaryFiles/elf/elfparser.cpp \
119 genericBinaryFiles/elf/elfparser.cpp \
114 genericBinaryFiles/elf/elffile.cpp \
120 genericBinaryFiles/elf/elffile.cpp \
115 qipdialogbox.cpp \
121 qipdialogbox.cpp \
116 SocExplorerPlot.cpp \
122 SocExplorerPlot.cpp \
117 genericBinaryFiles/elf/elffilewidget.cpp \
123 genericBinaryFiles/elf/elffilewidget.cpp \
118 genericBinaryFiles/srec/srecfile.cpp \
124 genericBinaryFiles/srec/srecfile.cpp \
119 genericBinaryFiles/srec/srecfilewidget.cpp \
125 genericBinaryFiles/srec/srecfilewidget.cpp \
120 genericBinaryFiles/abstractbinfile.cpp \
126 genericBinaryFiles/abstractbinfile.cpp \
121 genericBinaryFiles/BinFile/binaryfile.cpp \
127 genericBinaryFiles/BinFile/binaryfile.cpp \
122 genericBinaryFiles/BinFile/binaryfilewidget.cpp \
128 genericBinaryFiles/BinFile/binaryfilewidget.cpp \
123 genericBinaryFiles/genericbinaryfilewidget.cpp
129 genericBinaryFiles/genericbinaryfilewidget.cpp \
130 genericBinaryFiles/qvpushbutton.cpp \
131 genericBinaryFiles/qtablewidgetintitem.cpp \
132 genericBinaryFiles/filelist.cpp
124
133
125 FORMS += \
134 FORMS += \
126 genericBinaryFiles/elf/elffilewidget.ui \
135 genericBinaryFiles/elf/elffilewidget.ui \
127 genericBinaryFiles/srec/srecfilewidget.ui \
136 genericBinaryFiles/srec/srecfilewidget.ui \
128 genericBinaryFiles/BinFile/binaryfilewidget.ui \
137 genericBinaryFiles/BinFile/binaryfilewidget.ui \
129 genericBinaryFiles/genericbinaryfilewidget.ui
138 genericBinaryFiles/genericbinaryfilewidget.ui
130
139
131 OTHER_FILES += \
140 OTHER_FILES += \
132 ./pythongenerator.sh \
141 ./pythongenerator.sh \
133 ./pythonQtgeneratorCfg.txt
142 ./pythonQtgeneratorCfg.txt
134
143
135
144
136
145
137
146
138
147
General Comments 0
You need to be logged in to leave comments. Login now