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 @@
+
+SOURCES += \
+ $$PWD/AbstractAppender.cpp \
+ $$PWD/AbstractStringAppender.cpp \
+ $$PWD/ConsoleAppender.cpp \
+ $$PWD/FileAppender.cpp \
+ $$PWD/Logger.cpp \
+
+INCLUDES += \
+ $$PWD/AbstractAppender.h \
+ $$PWD/ConsoleAppender.h \
+ $$PWD/FileAppender.h \
+ $$PWD/OutputDebugAppender.h \
+ $$PWD/AbstractStringAppender.h \
+ $$PWD/CuteLogger_global.h \
+ $$PWD/Logger.h \
+
+DEFINES += \
+ 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 @@
+
+SOURCES += \
+ $$PWD/quazip.cpp \
+ $$PWD/quazipfile.cpp \
+ $$PWD/quazipnewinfo.cpp \
+ $$PWD/quazipfileinfo.cpp \
+ $$PWD/qioapi.cpp \
+ $$PWD/unzip.c \
+ $$PWD/zip.c \
+
+HEADERS += \
+ $$PWD/crypt.h \
+ $$PWD/ioapi.h \
+ $$PWD/quazipfile.h \
+ $$PWD/quazipfileinfo.h \
+ $$PWD/quazipnewinfo.h \
+ $$PWD/quazip.h \
+ $$PWD/quazipnewinfo.h \
+ $$PWD/quazip_global.h \
+ $$PWD/unzip.h \
+ $$PWD/zip.h \
+
+DEFINES += \
+ QUAZIP_STATIC
+
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 += \
  base/rockboxinfo.cpp \
  ../../tools/mkboot.c \
  ../../tools/iriver.c \
- quazip/quazip.cpp \
- quazip/quazipfile.cpp \
- quazip/quazipnewinfo.cpp \
- quazip/quazipfileinfo.cpp \
- quazip/qioapi.cpp \
- quazip/unzip.c \
- quazip/zip.c \
  base/ziputil.cpp \
  gui/comboboxviewdelegate.cpp \
  gui/selectiveinstallwidget.cpp \
@@ -88,11 +81,6 @@ SOURCES += \
  mspack/system-mspack.c \
  base/mspackutil.cpp \
  base/archiveutil.cpp \
- logger/AbstractAppender.cpp \
- logger/AbstractStringAppender.cpp \
- logger/ConsoleAppender.cpp \
- logger/FileAppender.cpp \
- logger/Logger.cpp \
 
 
 HEADERS += \
@@ -157,16 +145,6 @@ HEADERS += \
  base/rockboxinfo.h \
  ../../tools/mkboot.h \
  ../../tools/iriver.h \
- quazip/crypt.h \
- quazip/ioapi.h \
- quazip/quazipfile.h \
- quazip/quazipfileinfo.h \
- quazip/quazipnewinfo.h \
- quazip/quazip.h \
- quazip/quazipnewinfo.h \
- quazip/quazip_global.h \
- quazip/unzip.h \
- quazip/zip.h \
  base/ziputil.h \
  lame/lame.h \
  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 {
     message("release")
 }
 
-DEFINES += RBUTIL _LARGEFILE64_SOURCE CUTELOGGER_STATIC QUAZIP_STATIC
+DEFINES += RBUTIL _LARGEFILE64_SOURCE
 
 # check version of Qt installation
 !contains(QT_MAJOR_VERSION, 5):!macx:!*-msvc* {
@@ -246,4 +246,6 @@ unix {
 
 # source files are separate.
 include(rbutilqt.pri)
+include(quazip/quazip.pri)
+include(logger/logger.pri)