1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- a/externals/externals.pri
+++ b/externals/externals.pri
@@ -1,9 +1,6 @@
INCLUDEPATH += $${PWD} \
- $${PWD}/simplecpp \
- $${PWD}/tinyxml
+ $${PWD}/simplecpp
-HEADERS += $${PWD}/simplecpp/simplecpp.h \
- $${PWD}/tinyxml/tinyxml2.h
+HEADERS += $${PWD}/simplecpp/simplecpp.h
-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
- $${PWD}/tinyxml/tinyxml2.cpp
+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
DEFINES += CPPCHECKLIB_IMPORT
}
LIBS += -L$$PWD/../externals
+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
DESTDIR = .
RCC_DIR = temp
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -122,7 +122,6 @@ int main(int argc, char **argv)
std::vector<std::string> extfiles;
extfiles.push_back("externals/simplecpp/simplecpp.cpp");
- extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
std::vector<std::string> clifiles;
getCppFiles(clifiles, "cli/", false);
@@ -171,7 +170,6 @@ int main(int argc, char **argv)
std::ofstream fout1("test/testfiles.pri");
if (fout1.is_open()) {
fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
fout1 << "\n\nSOURCES += ";
for (unsigned int i = 0; i < testfiles.size(); ++i) {
const std::string filename(testfiles[i].substr(5));
@@ -335,9 +333,9 @@ int main(int argc, char **argv)
<< "endif\n\n";
makeConditionalVariable(fout, "PREFIX", "/usr");
- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml");
- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml");
- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml");
+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");
fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
|
