Merge branch 'master' of https://github.com/VioletGiraffe/file-commander

VioletGiraffe · Aug 23, 2024 · abbc22b · abbc22b
2 parents 4dd73e2 + 7d48cf4
commit abbc22b
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 94 deletions.
diff --git a/file-commander-core/config.pri b/file-commander-core/config.pri
@@ -17,20 +17,14 @@ contains(QT_ARCH, x86_64) {
 	ARCHITECTURE = x86
 }
 
-android {
-	Release:OUTPUT_DIR=android/release
-	Debug:OUTPUT_DIR=android/debug
-
-} else:ios {
-	Release:OUTPUT_DIR=ios/release
-	Debug:OUTPUT_DIR=ios/debug
-
-} else {
-	Release:OUTPUT_DIR=release/$${ARCHITECTURE}
-	Debug:OUTPUT_DIR=debug/$${ARCHITECTURE}
+Release{
+	OUTPUT_DIR=release/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=release
+}
 
-	Release:OUTPUT_DIR_NO_ARCH=release/
-	Debug:OUTPUT_DIR_NO_ARCH=debug/
+Debug{
+	OUTPUT_DIR=debug/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=debug
 }
 
 win*{

diff --git a/file-commander-core/core-tests/filecomparator/filecomparator.pro b/file-commander-core/core-tests/filecomparator/filecomparator.pro
@@ -5,13 +5,14 @@ TARGET = filecomparator_test
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcpputils.a $${DESTDIR}/libtest_utils.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a $${DESTDIR}/libtest_utils.a
 }
 
 for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
@@ -20,7 +21,7 @@ INCLUDEPATH += \
 	../../src/ \
 	../test-utils/src/
 
-LIBS += -L$${DESTDIR} -lcpputils -ltest_utils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcpputils -ltest_utils
 
 SOURCES += \
 	filecomparator_test.cpp \

diff --git a/file-commander-core/core-tests/filesystemobject-high-level/filesystemobject-high-level.pro b/file-commander-core/core-tests/filesystemobject-high-level/filesystemobject-high-level.pro
@@ -5,20 +5,21 @@ TARGET = fso_test_high_level
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
 INCLUDEPATH += \
 	$${PWD}/
 
-LIBS += -L$${DESTDIR} -lqtutils -lcpputils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lqtutils -lcpputils
 
 SOURCES += \
 	../../src/filesystemhelperfunctions.cpp \

diff --git a/file-commander-core/core-tests/filesystemobject/filesystemobject.pro b/file-commander-core/core-tests/filesystemobject/filesystemobject.pro
@@ -5,20 +5,21 @@ TARGET   = fso_test
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
 INCLUDEPATH += \
 	$${PWD}/
 
-LIBS += -L$${DESTDIR} -lqtutils -lcpputils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lqtutils -lcpputils
 
 SOURCES += \
 	../../src/filesystemhelperfunctions.cpp \

diff --git a/file-commander-core/core-tests/operationperformer/operationperformer.pro b/file-commander-core/core-tests/operationperformer/operationperformer.pro
@@ -5,17 +5,17 @@ CONFIG += console
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
-DESTDIR_NO_ARCH = ../../../bin/$${OUTPUT_DIR_NO_ARCH}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
-LIBS += -L$${DESTDIR} -lcpputils -lqtutils -ltest_utils
-LIBS += -L$${DESTDIR_NO_ARCH} -lthin_io
+LIBS += -L$${DESTDIR} -lqtutils -ltest_utils
+LIBS += -L$${DESTDIR_NOARCH} -lcpputils -lthin_io
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += \

diff --git a/file-commander-core/core-tests/test-utils/test-utils.pro b/file-commander-core/core-tests/test-utils/test-utils.pro
@@ -7,13 +7,14 @@ QT = core
 include(../../config.pri)
 
 DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH  = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += ../../src/
@@ -22,14 +23,14 @@ for (included_item, INCLUDEPATH): INCLUDEPATH += ../../$${included_item}
 HEADERS += \
 	src/cfolderenumeratorrecursive.h \
 	src/ctestfoldergenerator.h \
-    src/catch2_utils.hpp \
-    src/foldercomparator.h \
-    src/qt_helpers.hpp \
-    src/crandomdatagenerator.h
+	src/catch2_utils.hpp \
+	src/foldercomparator.h \
+	src/qt_helpers.hpp \
+	src/crandomdatagenerator.h
 
 SOURCES += \
 	src/cfolderenumeratorrecursive.cpp \
 	src/ctestfoldergenerator.cpp \
-    src/foldercomparator.cpp \
-    src/qt_helpers.cpp \
-    src/crandomdatagenerator.cpp
+	src/foldercomparator.cpp \
+	src/qt_helpers.cpp \
+	src/crandomdatagenerator.cpp
diff --git a/file-commander-core/file-commander-core.pro b/file-commander-core/file-commander-core.pro
@@ -3,19 +3,19 @@ TARGET   = core
 
 include(config.pri)
 
-DESTDIR	= ../bin/$${OUTPUT_DIR}
-DESTDIR_NO_ARCH = ../bin/$${OUTPUT_DIR_NO_ARCH}
+DESTDIR = ../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH = ../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../build/$${OUTPUT_DIR}/$${TARGET}
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a $${DESTDIR}/libcpputils.a
-	PRE_TARGETDEPS += $${DESTDIR_NO_ARCH}/libthin_io.a
+	PRE_TARGETDEPS += $${DESTDIR}/libqtutils.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libthin_io.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
-LIBS += -L$${DESTDIR} -lcpputils -lqtutils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcpputils -lqtutils
 
 HEADERS += \
 	src/cfilesystemobject.h \

diff --git a/file-commander-core/src/filesearchengine/cfilesearchengine.cpp b/file-commander-core/src/filesearchengine/cfilesearchengine.cpp
@@ -46,7 +46,7 @@ bool CFileSearchEngine::search(const QString& what, bool subjectCaseSensitive, c
 	if (what.isEmpty() || where.empty())
 		return false;
 
-	_workerThread.exec([=](){
+	_workerThread.exec([=, this](){
 		::setThreadName("File search engine thread");
 
 		uint64_t itemCounter = 0;

diff --git a/plugins/tools/filecomparisonplugin/filecomparisonplugin.pro b/plugins/tools/filecomparisonplugin/filecomparisonplugin.pro
@@ -15,28 +15,26 @@ contains(QT_ARCH, x86_64) {
 	ARCHITECTURE = x86
 }
 
-android {
-	Release:OUTPUT_DIR=android/release
-	Debug:OUTPUT_DIR=android/debug
-
-} else:ios {
-	Release:OUTPUT_DIR=ios/release
-	Debug:OUTPUT_DIR=ios/debug
+Release{
+	OUTPUT_DIR=release/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=release
+}
 
-} else {
-	Release:OUTPUT_DIR=release/$${ARCHITECTURE}
-	Debug:OUTPUT_DIR=debug/$${ARCHITECTURE}
+Debug{
+	OUTPUT_DIR=debug/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=debug
 }
 
-DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
-DEFINES += PLUGIN_MODULE
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcore -lqtutils -lcpputils
 
-LIBS += -L../../../bin/$${OUTPUT_DIR} -lcore -lqtutils -lcpputils
+DEFINES += PLUGIN_MODULE
 
 win*{
 	QMAKE_CXXFLAGS += /MP /Zi /wd4251 /JMC
@@ -64,7 +62,7 @@ win32*:!*msvc2012:*msvc* {
 }
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcore.a
+	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libqtutils.a $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += \

diff --git a/plugins/viewer/imageviewer/imageviewer.pro b/plugins/viewer/imageviewer/imageviewer.pro
@@ -16,20 +16,18 @@ contains(QT_ARCH, x86_64) {
 	ARCHITECTURE = x86
 }
 
-android {
-	Release:OUTPUT_DIR=android/release
-	Debug:OUTPUT_DIR=android/debug
-
-} else:ios {
-	Release:OUTPUT_DIR=ios/release
-	Debug:OUTPUT_DIR=ios/debug
+Release{
+	OUTPUT_DIR=release/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=release
+}
 
-} else {
-	Release:OUTPUT_DIR=release/$${ARCHITECTURE}
-	Debug:OUTPUT_DIR=debug/$${ARCHITECTURE}
+Debug{
+	OUTPUT_DIR=debug/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=debug
 }
 
-DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
@@ -46,7 +44,7 @@ INCLUDEPATH += \
 
 DEFINES += PLUGIN_MODULE
 
-LIBS += -L../../../bin/$${OUTPUT_DIR} -lcore -limage-processing -lqtutils -lcpputils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcore -limage-processing -lqtutils -lcpputils
 
 win*{
 	QMAKE_CXXFLAGS += /MP /Zi /wd4251
@@ -87,5 +85,6 @@ FORMS += \
 	src/cimageviewerwindow.ui
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcore.a
+	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libimage-processing.a $${DESTDIR}/libqtutils.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a
 }
diff --git a/plugins/viewer/textviewer/textviewer.pro b/plugins/viewer/textviewer/textviewer.pro
@@ -19,28 +19,26 @@ contains(QT_ARCH, x86_64) {
 	ARCHITECTURE = x86
 }
 
-android {
-	Release:OUTPUT_DIR=android/release
-	Debug:OUTPUT_DIR=android/debug
-
-} else:ios {
-	Release:OUTPUT_DIR=ios/release
-	Debug:OUTPUT_DIR=ios/debug
+Release{
+	OUTPUT_DIR=release/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=release
+}
 
-} else {
-	Release:OUTPUT_DIR=release/$${ARCHITECTURE}
-	Debug:OUTPUT_DIR=debug/$${ARCHITECTURE}
+Debug{
+	OUTPUT_DIR=debug/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=debug
 }
 
-DESTDIR  = ../../../bin/$${OUTPUT_DIR}
+DESTDIR = ../../../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH = ../../../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 RCC_DIR     = ../../../build/$${OUTPUT_DIR}/$${TARGET}
 
 DEFINES += PLUGIN_MODULE
 
-LIBS += -L../../../bin/$${OUTPUT_DIR} -lcore -lqtutils -ltext_encoding_detector -lcpputils
+LIBS += -L$${DESTDIR} -L$${DESTDIR_NOARCH} -lcore -lqtutils -ltext_encoding_detector -lcpputils
 
 win*{
 	QMAKE_CXXFLAGS += /MP /Zi /wd4251 /JMC
@@ -68,7 +66,8 @@ win32*:!*msvc2012:*msvc* {
 }
 
 mac*|linux*|freebsd{
-	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libtext_encoding_detector.a
+	PRE_TARGETDEPS += $${DESTDIR}/libcore.a $${DESTDIR}/libtext_encoding_detector.a $${DESTDIR}/libqtutils.a
+	PRE_TARGETDEPS += $${DESTDIR_NOARCH}/libcpputils.a
 }
 
 INCLUDEPATH += \

diff --git a/qt-app/qt-app.pro b/qt-app/qt-app.pro
@@ -19,24 +19,18 @@ contains(QT_ARCH, x86_64) {
 	ARCHITECTURE = x86
 }
 
-android {
-	Release:OUTPUT_DIR=android/release
-	Debug:OUTPUT_DIR=android/debug
-
-} else:ios {
-	Release:OUTPUT_DIR=ios/release
-	Debug:OUTPUT_DIR=ios/debug
-
-} else {
-	Release:OUTPUT_DIR=release/$${ARCHITECTURE}
-	Debug:OUTPUT_DIR=debug/$${ARCHITECTURE}
+Release{
+	OUTPUT_DIR=release/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=release
+}
 
-	Release:OUTPUT_DIR_NO_ARCH=release
-	Debug:OUTPUT_DIR_NO_ARCH=debug
+Debug{
+	OUTPUT_DIR=debug/$${ARCHITECTURE}
+	OUTPUT_DIR_NOARCH=debug
 }
 
-DESTDIR	= ../bin/$${OUTPUT_DIR}
-DESTDIR_NO_ARCH = ../bin/$${OUTPUT_DIR_NO_ARCH}
+DESTDIR = ../bin/$${OUTPUT_DIR}
+DESTDIR_NOARCH = ../bin/$${OUTPUT_DIR_NOARCH}
 OBJECTS_DIR = ../build/$${OUTPUT_DIR}/$${TARGET}
 MOC_DIR     = ../build/$${OUTPUT_DIR}/$${TARGET}
 UI_DIR      = ../build/$${OUTPUT_DIR}/$${TARGET}
@@ -124,7 +118,7 @@ FORMS += \
 DEFINES += _SCL_SECURE_NO_WARNINGS
 
 LIBS += -L$${DESTDIR} -lautoupdater -lcore -lqtutils -lcpputils
-LIBS += -L$${DESTDIR_NO_ARCH} -lthin_io
+LIBS += -L$${DESTDIR_NOARCH} -lthin_io
 
 win*{
 	LIBS += -lole32 -lShell32 -lUser32

diff --git a/qtutils b/qtutils