diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2015-03-25 21:58:25 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2015-05-02 16:52:14 +0200 |
commit | 9ecfe6151b484f67b10fa15c67d3713d73870e0b (patch) | |
tree | a1d53a3ed1e56cd20f94ed51807bbb9000d39682 | |
parent | b230cf3aa24f3883b8b165bd5fd56620a9a95e47 (diff) | |
download | rockbox-9ecfe6151b484f67b10fa15c67d3713d73870e0b.tar.gz rockbox-9ecfe6151b484f67b10fa15c67d3713d73870e0b.zip |
Separate logger / quazip project file parts.
Move to separate project include file for better readability and reusability.
Change-Id: If75805be8fad4aec8ede600f5c616a9412ac0505
-rw-r--r-- | rbutil/rbutilqt/logger/logger.pri | 19 | ||||
-rw-r--r-- | rbutil/rbutilqt/quazip/quazip.pri | 25 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pri | 22 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 4 |
4 files changed, 47 insertions, 23 deletions
diff --git a/rbutil/rbutilqt/logger/logger.pri b/rbutil/rbutilqt/logger/logger.pri new file mode 100644 index 0000000000..ec8d68b399 --- /dev/null +++ b/rbutil/rbutilqt/logger/logger.pri | |||
@@ -0,0 +1,19 @@ | |||
1 | |||
2 | SOURCES += \ | ||
3 | $$PWD/AbstractAppender.cpp \ | ||
4 | $$PWD/AbstractStringAppender.cpp \ | ||
5 | $$PWD/ConsoleAppender.cpp \ | ||
6 | $$PWD/FileAppender.cpp \ | ||
7 | $$PWD/Logger.cpp \ | ||
8 | |||
9 | INCLUDES += \ | ||
10 | $$PWD/AbstractAppender.h \ | ||
11 | $$PWD/ConsoleAppender.h \ | ||
12 | $$PWD/FileAppender.h \ | ||
13 | $$PWD/OutputDebugAppender.h \ | ||
14 | $$PWD/AbstractStringAppender.h \ | ||
15 | $$PWD/CuteLogger_global.h \ | ||
16 | $$PWD/Logger.h \ | ||
17 | |||
18 | DEFINES += \ | ||
19 | CUTELOGGER_STATIC | ||
diff --git a/rbutil/rbutilqt/quazip/quazip.pri b/rbutil/rbutilqt/quazip/quazip.pri new file mode 100644 index 0000000000..cae9d965c1 --- /dev/null +++ b/rbutil/rbutilqt/quazip/quazip.pri | |||
@@ -0,0 +1,25 @@ | |||
1 | |||
2 | SOURCES += \ | ||
3 | $$PWD/quazip.cpp \ | ||
4 | $$PWD/quazipfile.cpp \ | ||
5 | $$PWD/quazipnewinfo.cpp \ | ||
6 | $$PWD/quazipfileinfo.cpp \ | ||
7 | $$PWD/qioapi.cpp \ | ||
8 | $$PWD/unzip.c \ | ||
9 | $$PWD/zip.c \ | ||
10 | |||
11 | HEADERS += \ | ||
12 | $$PWD/crypt.h \ | ||
13 | $$PWD/ioapi.h \ | ||
14 | $$PWD/quazipfile.h \ | ||
15 | $$PWD/quazipfileinfo.h \ | ||
16 | $$PWD/quazipnewinfo.h \ | ||
17 | $$PWD/quazip.h \ | ||
18 | $$PWD/quazipnewinfo.h \ | ||
19 | $$PWD/quazip_global.h \ | ||
20 | $$PWD/unzip.h \ | ||
21 | $$PWD/zip.h \ | ||
22 | |||
23 | DEFINES += \ | ||
24 | QUAZIP_STATIC | ||
25 | |||
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index a1cddb81bc..9f1aea694d 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri | |||
@@ -69,13 +69,6 @@ SOURCES += \ | |||
69 | base/rockboxinfo.cpp \ | 69 | base/rockboxinfo.cpp \ |
70 | ../../tools/mkboot.c \ | 70 | ../../tools/mkboot.c \ |
71 | ../../tools/iriver.c \ | 71 | ../../tools/iriver.c \ |
72 | quazip/quazip.cpp \ | ||
73 | quazip/quazipfile.cpp \ | ||
74 | quazip/quazipnewinfo.cpp \ | ||
75 | quazip/quazipfileinfo.cpp \ | ||
76 | quazip/qioapi.cpp \ | ||
77 | quazip/unzip.c \ | ||
78 | quazip/zip.c \ | ||
79 | base/ziputil.cpp \ | 72 | base/ziputil.cpp \ |
80 | gui/comboboxviewdelegate.cpp \ | 73 | gui/comboboxviewdelegate.cpp \ |
81 | gui/selectiveinstallwidget.cpp \ | 74 | gui/selectiveinstallwidget.cpp \ |
@@ -88,11 +81,6 @@ SOURCES += \ | |||
88 | mspack/system-mspack.c \ | 81 | mspack/system-mspack.c \ |
89 | base/mspackutil.cpp \ | 82 | base/mspackutil.cpp \ |
90 | base/archiveutil.cpp \ | 83 | base/archiveutil.cpp \ |
91 | logger/AbstractAppender.cpp \ | ||
92 | logger/AbstractStringAppender.cpp \ | ||
93 | logger/ConsoleAppender.cpp \ | ||
94 | logger/FileAppender.cpp \ | ||
95 | logger/Logger.cpp \ | ||
96 | 84 | ||
97 | 85 | ||
98 | HEADERS += \ | 86 | HEADERS += \ |
@@ -157,16 +145,6 @@ HEADERS += \ | |||
157 | base/rockboxinfo.h \ | 145 | base/rockboxinfo.h \ |
158 | ../../tools/mkboot.h \ | 146 | ../../tools/mkboot.h \ |
159 | ../../tools/iriver.h \ | 147 | ../../tools/iriver.h \ |
160 | quazip/crypt.h \ | ||
161 | quazip/ioapi.h \ | ||
162 | quazip/quazipfile.h \ | ||
163 | quazip/quazipfileinfo.h \ | ||
164 | quazip/quazipnewinfo.h \ | ||
165 | quazip/quazip.h \ | ||
166 | quazip/quazipnewinfo.h \ | ||
167 | quazip/quazip_global.h \ | ||
168 | quazip/unzip.h \ | ||
169 | quazip/zip.h \ | ||
170 | base/ziputil.h \ | 148 | base/ziputil.h \ |
171 | lame/lame.h \ | 149 | lame/lame.h \ |
172 | gui/comboboxviewdelegate.h \ | 150 | gui/comboboxviewdelegate.h \ |
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 1f09f2d35e..e5d4fef837 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -163,7 +163,7 @@ dbg { | |||
163 | message("release") | 163 | message("release") |
164 | } | 164 | } |
165 | 165 | ||
166 | DEFINES += RBUTIL _LARGEFILE64_SOURCE CUTELOGGER_STATIC QUAZIP_STATIC | 166 | DEFINES += RBUTIL _LARGEFILE64_SOURCE |
167 | 167 | ||
168 | # check version of Qt installation | 168 | # check version of Qt installation |
169 | !contains(QT_MAJOR_VERSION, 5):!macx:!*-msvc* { | 169 | !contains(QT_MAJOR_VERSION, 5):!macx:!*-msvc* { |
@@ -246,4 +246,6 @@ unix { | |||
246 | 246 | ||
247 | # source files are separate. | 247 | # source files are separate. |
248 | include(rbutilqt.pri) | 248 | include(rbutilqt.pri) |
249 | include(quazip/quazip.pri) | ||
250 | include(logger/logger.pri) | ||
249 | 251 | ||