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