diff --git a/build2/qt/HGBase/HGBase.pro b/build2/qt/HGBase/HGBase.pro index f6cea5c1..c8f98212 100644 --- a/build2/qt/HGBase/HGBase.pro +++ b/build2/qt/HGBase/HGBase.pro @@ -98,15 +98,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -170,6 +174,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/base/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/base/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../modules/base/HGBase64.cpp \ ../../../modules/base/HGBuffer.cpp \ diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index 30e856c0..3135d2f9 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -111,15 +111,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -175,6 +179,19 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET} + message(SRCEXE_FILE: $$SRCEXE_FILE) + + QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH + } +} + SOURCES += \ ../../../app/fwupgrade/dialog_updateprogress.cpp \ ../../../app/fwupgrade/dialog_upgradefirmware.cpp \ diff --git a/build2/qt/HGImgFmt/HGImgFmt.pro b/build2/qt/HGImgFmt/HGImgFmt.pro index ad7b7d49..6412e7af 100644 --- a/build2/qt/HGImgFmt/HGImgFmt.pro +++ b/build2/qt/HGImgFmt/HGImgFmt.pro @@ -119,15 +119,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -210,6 +214,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/imgfmt/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/imgfmt/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../modules/imgfmt/HGBmp.cpp \ ../../../modules/imgfmt/HGGif.cpp \ diff --git a/build2/qt/HGImgProc/HGImgProc.pro b/build2/qt/HGImgProc/HGImgProc.pro index 74078ca9..eb6c9cc3 100644 --- a/build2/qt/HGImgProc/HGImgProc.pro +++ b/build2/qt/HGImgProc/HGImgProc.pro @@ -123,6 +123,7 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_highgui.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_features2d.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_imgproc.a @@ -132,6 +133,7 @@ unix { } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_highgui.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_features2d.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_imgproc.a @@ -141,6 +143,7 @@ unix { } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_highgui.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_features2d.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_imgproc.a @@ -149,6 +152,7 @@ unix { } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_highgui.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_features2d.a LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_imgproc.a @@ -228,6 +232,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/imgproc/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/imgproc/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../modules/imgproc/CvxText.cpp \ ../../../modules/imgproc/HGImgProc.cpp \ diff --git a/build2/qt/HGSaneUI/HGSaneUI.pro b/build2/qt/HGSaneUI/HGSaneUI.pro index 0cc41033..594841d0 100644 --- a/build2/qt/HGSaneUI/HGSaneUI.pro +++ b/build2/qt/HGSaneUI/HGSaneUI.pro @@ -103,15 +103,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -177,6 +181,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/saneui/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/saneui/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../modules/saneui/HGSaneUI.cpp \ ../../../modules/saneui/dialog_device_scan.cpp \ diff --git a/build2/qt/HGSaneUser/HGSaneUser.pro b/build2/qt/HGSaneUser/HGSaneUser.pro index bd97b674..fee647bc 100644 --- a/build2/qt/HGSaneUser/HGSaneUser.pro +++ b/build2/qt/HGSaneUser/HGSaneUser.pro @@ -99,15 +99,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -173,6 +177,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/sane_user/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/sane_user/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../modules/sane_user/HGSane.cpp \ ../../../modules/sane_user/HGSaneImpl.cpp diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro index c88a7d34..bf4d955d 100644 --- a/build2/qt/HGScanner/HGScanner.pro +++ b/build2/qt/HGScanner/HGScanner.pro @@ -115,15 +115,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -135,7 +139,7 @@ unix { LIBS += -lpthread -ldl LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX}ImgFmt \ -l$${OEM_PREFIX}ImgProc -l$${OEM_PREFIX2}Version - LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lsane-$${OEM_PREFIX3}sane + LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lsane-$${OEM_PREFIX3}sane -llang } INCLUDEPATH += $$PWD/../../../app/scanner @@ -180,6 +184,19 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET} + message(SRCEXE_FILE: $$SRCEXE_FILE) + + QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH + } +} + SOURCES += \ ../../../app/scanner/HGImgThumb.cpp \ ../../../app/scanner/HGImgView.cpp \ diff --git a/build2/qt/HGScannerLib/HGScannerLib.pro b/build2/qt/HGScannerLib/HGScannerLib.pro index 65c5a1fb..0f601e84 100644 --- a/build2/qt/HGScannerLib/HGScannerLib.pro +++ b/build2/qt/HGScannerLib/HGScannerLib.pro @@ -191,6 +191,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/scannerlib/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/scannerlib/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../sdk/scannerlib/HGLibDeviceImpl.cpp \ ../../../sdk/scannerlib/HGScannerLib.cpp \ diff --git a/build2/qt/HGTwainUser/HGTwainUser.pro b/build2/qt/HGTwainUser/HGTwainUser.pro index 8ec8c3fb..e5ac0d54 100644 --- a/build2/qt/HGTwainUser/HGTwainUser.pro +++ b/build2/qt/HGTwainUser/HGTwainUser.pro @@ -109,15 +109,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro index e48d228f..eb38e1b3 100644 --- a/build2/qt/HGUpgrade/HGUpgrade.pro +++ b/build2/qt/HGUpgrade/HGUpgrade.pro @@ -100,15 +100,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -160,6 +164,19 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET} + message(SRCEXE_FILE: $$SRCEXE_FILE) + + QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH + } +} + SOURCES += \ ../../../app/upgrade/HGUpgrade.cpp \ ../../../app/upgrade/main.cpp \ diff --git a/build2/qt/HGVersion/HGVersion.pro b/build2/qt/HGVersion/HGVersion.pro index 576a6c13..f03547ce 100644 --- a/build2/qt/HGVersion/HGVersion.pro +++ b/build2/qt/HGVersion/HGVersion.pro @@ -103,15 +103,19 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 + MY_ARCH2 = x86_64 } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 + MY_ARCH2 = aarch64 } contains(QT_ARCH, mips64) { MY_ARCH = mips64 + MY_ARCH2 = mips64 } contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 + MY_ARCH2 = loongarch64 } CONFIG += unversioned_libname unversioned_soname @@ -180,6 +184,23 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTDLL_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTDLL_PATH: $$DESTDLL_PATH) + DESTHEADER_PATH = $${PWD}/../../../../sdk/include/version/ + message(DESTHEADER_PATH: $$DESTHEADER_PATH) + + SRCDLL_FILE = $${DESTDIR}/lib$${TARGET}.so + message(SRCDLL_FILE: $$SRCDLL_FILE) + SRCHEADER_FILE = $${PWD}/../../../modules/version/*.h + message(SRCHEADER_FILE: $$SRCHEADER_FILE) + + QMAKE_POST_LINK += cp $$SRCDLL_FILE $$DESTDLL_PATH && cp $$SRCHEADER_FILE $$DESTHEADER_PATH + } +} + SOURCES += \ ../../../modules/version/HGVersion.cpp \ ../../../modules/version/HGVersionImpl.cpp \ diff --git a/build2/qt/HGWebScan/HGWebScan.pro b/build2/qt/HGWebScan/HGWebScan.pro index f9361fd5..25ae55b1 100644 --- a/build2/qt/HGWebScan/HGWebScan.pro +++ b/build2/qt/HGWebScan/HGWebScan.pro @@ -178,6 +178,19 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET} + message(SRCEXE_FILE: $$SRCEXE_FILE) + + QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH + } +} + SOURCES += \ ../../../sdk/webscan/HttpHead.cpp \ ../../../sdk/webscan/MsgPumpCallback.cpp \ diff --git a/build2/qt/HGWebService/HGWebService.pro b/build2/qt/HGWebService/HGWebService.pro index f427550c..da8cd312 100644 --- a/build2/qt/HGWebService/HGWebService.pro +++ b/build2/qt/HGWebService/HGWebService.pro @@ -193,6 +193,19 @@ win32 { } } +unix { + + CONFIG(release, debug|release) { + DESTEXE_PATH = $$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2}/ + message(DESTEXE_PATH: $$DESTEXE_PATH) + + SRCEXE_FILE = $${DESTDIR}/$${TARGET} + message(SRCEXE_FILE: $$SRCEXE_FILE) + + QMAKE_POST_LINK += cp $$SRCEXE_FILE $$DESTEXE_PATH + } +} + SOURCES += \ ../../../sdk/webservice/HttpHead.cpp \ ../../../sdk/webservice/HttpServer.cpp \