##// END OF EJS Templates
merge
jeandet -
r48:b8dc7b62e9e7 merge default
parent child
Show More
@@ -1,136 +1,135
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}/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 DEFINES+=RS232_debug
15
15
16 win32:LIBS += $${PWD}/elf/libelfWin32/bin/libelf.a
16 win32:LIBS += $${PWD}/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 elf/elfinfowdgt.h \
38 elf/elfinfowdgt.h \
39 elf/elfparser.h \
39 elf/elfparser.h \
40 elf/elffile.h \
40 elf/elffile.h \
41 elf/elffilewidget.h \
41 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 srec/srecfile.h \
45 srec/srecfile.h \
46 srec/srecfilewidget.h \
46 srec/srecfilewidget.h \
47 abstractbinfile.h \
48 BinFile/binaryfile.h \
47 BinFile/binaryfile.h \
49 BinFile/binaryfilewidget.h
48 BinFile/binaryfilewidget.h \
50
49 abstractbinfile.h
51
50
52 win32{
51 win32{
53 elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/libelf
52 elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/libelf
54 elfheader.files += \
53 elfheader.files += \
55 elf/libelfWin32/include/libelf/byteswap.h \
54 elf/libelfWin32/include/libelf/byteswap.h \
56 elf/libelfWin32/include/libelf/errors.h \
55 elf/libelfWin32/include/libelf/errors.h \
57 elf/libelfWin32/include/libelf/gelf.h \
56 elf/libelfWin32/include/libelf/gelf.h \
58 elf/libelfWin32/include/libelf/nlist.h \
57 elf/libelfWin32/include/libelf/nlist.h \
59 elf/libelfWin32/include/libelf/sys_elf.h \
58 elf/libelfWin32/include/libelf/sys_elf.h \
60 elf/libelfWin32/include/libelf/verneed.h \
59 elf/libelfWin32/include/libelf/verneed.h \
61 elf/libelfWin32/include/libelf/elf_repl.h \
60 elf/libelfWin32/include/libelf/elf_repl.h \
62 elf/libelfWin32/include/libelf/ext_types.h \
61 elf/libelfWin32/include/libelf/ext_types.h \
63 elf/libelfWin32/include/libelf/libelf.h \
62 elf/libelfWin32/include/libelf/libelf.h \
64 elf/libelfWin32/include/libelf/private.h \
63 elf/libelfWin32/include/libelf/private.h \
65 elf/libelfWin32/include/libelf/verdef.h
64 elf/libelfWin32/include/libelf/verdef.h
66 INSTALLS += elfheader
65 INSTALLS += elfheader
67 }
66 }
68
67
69
68
70 isEmpty(header.path) {
69 isEmpty(header.path) {
71 error(can\'t get QT_INSTALL_HEADERS)
70 error(can\'t get QT_INSTALL_HEADERS)
72 }
71 }
73
72
74 INSTALLS += target header
73 INSTALLS += target header
75
74
76 INCLUDEPATH += QCustomPlot qhexedit srec
75 INCLUDEPATH += QCustomPlot qhexedit srec
77
76
78 HEADERS += \
77 HEADERS += \
79 memsizewdgt.h \
78 memsizewdgt.h \
80 qhexspinbox.h \
79 qhexspinbox.h \
81 qsvgicon.h \
80 qsvgicon.h \
82 qhexedit/qhexedit_p.h \
81 qhexedit/qhexedit_p.h \
83 qhexedit/qhexedit.h \
82 qhexedit/qhexedit.h \
84 qhexedit/xbytearray.h \
83 qhexedit/xbytearray.h \
85 qhexedit/commands.h \
84 qhexedit/commands.h \
86 QCustomPlot/qcustomplot.h \
85 QCustomPlot/qcustomplot.h \
87 tcp_terminal_client.h \
86 tcp_terminal_client.h \
88 elf/elfinfowdgt.h \
87 elf/elfinfowdgt.h \
89 elf/elfparser.h \
88 elf/elfparser.h \
90 elf/elffile.h \
89 elf/elffile.h \
91 qipdialogbox.h \
90 qipdialogbox.h \
92 PySocExplorer.h \
91 PySocExplorer.h \
93 SocExplorerPlot.h \
92 SocExplorerPlot.h \
94 elf/elffilewidget.h \
93 elf/elffilewidget.h \
95 qtablewidgetintitem.h \
94 qtablewidgetintitem.h \
96 srec/srecfile.h \
95 srec/srecfile.h \
97 srec/srecfilewidget.h \
96 srec/srecfilewidget.h \
98 abstractbinfile.h \
97 abstractbinfile.h \
99 BinFile/binaryfile.h \
98 BinFile/binaryfile.h \
100 BinFile/binaryfilewidget.h
99 BinFile/binaryfilewidget.h
101
100
102
101
103 SOURCES += \
102 SOURCES += \
104 memsizewdgt.cpp \
103 memsizewdgt.cpp \
105 qhexspinbox.cpp \
104 qhexspinbox.cpp \
106 qsvgicon.cpp \
105 qsvgicon.cpp \
107 qhexedit/qhexedit_p.cpp \
106 qhexedit/qhexedit_p.cpp \
108 qhexedit/qhexedit.cpp \
107 qhexedit/qhexedit.cpp \
109 qhexedit/xbytearray.cpp \
108 qhexedit/xbytearray.cpp \
110 qhexedit/commands.cpp \
109 qhexedit/commands.cpp \
111 QCustomPlot/qcustomplot.cpp \
110 QCustomPlot/qcustomplot.cpp \
112 tcp_terminal_client.cpp \
111 tcp_terminal_client.cpp \
113 elf/elfinfowdgt.cpp \
112 elf/elfinfowdgt.cpp \
114 elf/elfparser.cpp \
113 elf/elfparser.cpp \
115 elf/elffile.cpp \
114 elf/elffile.cpp \
116 qipdialogbox.cpp \
115 qipdialogbox.cpp \
117 SocExplorerPlot.cpp \
116 SocExplorerPlot.cpp \
118 elf/elffilewidget.cpp \
117 elf/elffilewidget.cpp \
119 qtablewidgetintitem.cpp \
118 qtablewidgetintitem.cpp \
120 srec/srecfile.cpp \
119 srec/srecfile.cpp \
121 srec/srecfilewidget.cpp \
120 srec/srecfilewidget.cpp \
122 abstractbinfile.cpp \
121 abstractbinfile.cpp \
123 BinFile/binaryfile.cpp \
122 BinFile/binaryfile.cpp \
124 BinFile/binaryfilewidget.cpp
123 BinFile/binaryfilewidget.cpp
125
124
126 FORMS += \
125 FORMS += \
127 elf/elffilewidget.ui \
126 elf/elffilewidget.ui \
128 srec/srecfilewidget.ui \
127 srec/srecfilewidget.ui \
129 BinFile/binaryfilewidget.ui
128 BinFile/binaryfilewidget.ui
130
129
131 OTHER_FILES += \
130 OTHER_FILES += \
132 ./pythongenerator.sh \
131 ./pythongenerator.sh \
133 ./pythonQtgeneratorCfg.txt
132 ./pythonQtgeneratorCfg.txt
134
133
135
134
136
135
General Comments 0
You need to be logged in to leave comments. Login now