Linux/mac build fixed

Author: web-flow

file-commander-core/file-commander-core.pro

@@ -11,8 +11,7 @@ UI_DIR      = ../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a
-	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libthin_io.a $${DESTDIR_NOARCH}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libthin_io.a $${DESTDIR_NOARCH}/libcpputils.a $${DESTDIR_NOARCH}/libqtutils.a
 }
 
 LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcpputils -lqtutils

file-commander.pro

@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qt_app qtutils text_encoding_detector file_commander_core autoupdater cpputils image-processing cpp-template-utils thin_io textviewerplugin imageviewerplugin filecomparisonplugin
+SUBDIRS = qt_app qtutils text_encoding_detector file_commander_core autoupdater cpputils image-processing cpp-template-utils thin_io textviewerplugin imageviewerplugin filecomparisonplugin
 
 qtutils.depends = cpputils image-processing
 

plugins/tools/filecomparisonplugin/filecomparisonplugin.pro

@@ -62,7 +62,7 @@ win32*:!*msvc2012:*msvc* {
 }
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR_NOARCH}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += \

plugins/viewer/imageviewer/imageviewer.pro

@@ -86,6 +86,6 @@ FORMS += \
 	src/cimageviewerwindow.ui
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libimage-processing.a $${DESTDIR}/libqtutils.a
-	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libimage-processing.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a $${DESTDIR_NOARCH}/libqtutils.a
 }

plugins/viewer/textviewer/textviewer.pro

@@ -66,8 +66,8 @@ win32*:!*msvc2012:*msvc* {
 }
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libtext_encoding_detector.a $${DESTDIR}/libqtutils.a
-	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libtext_encoding_detector.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a $${DESTDIR_NOARCH}/libqtutils.a
 }
 
 INCLUDEPATH += \
@@ -77,7 +77,6 @@ INCLUDEPATH += \
 	../../../cpputils \
 	../../../cpp-template-utils \
 	../../../3rdparty \
-	../../../github-releases-autoupdater/3rdparty \
 	../../../text-encoding-detector/text-encoding-detector/src \
 	$$PWD/src/