From 37e95e4eb80110076becce525b7c4d26965532b4 Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Fri, 31 Mar 2023 12:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build2/qt/HGDemo/HGDemo.pro | 5 +++++ build2/qt/HGFWUpgrade/HGFWUpgrade.pro | 8 ++++---- build2/qt/HGScanner/HGScanner.pro | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/build2/qt/HGDemo/HGDemo.pro b/build2/qt/HGDemo/HGDemo.pro index 5ac6ebda..7e8fa252 100644 --- a/build2/qt/HGDemo/HGDemo.pro +++ b/build2/qt/HGDemo/HGDemo.pro @@ -81,6 +81,9 @@ win32 { LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt -l$${OEM_PREFIX}ImgProc \ -l$${OEM_PREFIX}SaneUser -l$${OEM_PREFIX}TwainUser + + # sane.dll + LIBS += -L$$PWD/../../../../release/win/$${MY_ARCH}/OEM/$${OEM_NAME} } unix { @@ -115,6 +118,8 @@ unix { LIBS += -lpthread -ldl LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt -l$${OEM_PREFIX2}ImgProc \ -l$${OEM_PREFIX2}SaneUI -l$${OEM_PREFIX2}SaneUser -l$${OEM_PREFIX2}TwainUser + + LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} } INCLUDEPATH += $$PWD/../../../modules diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index 3135d2f9..c057537f 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -91,8 +91,8 @@ win32 { } LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 - 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/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt \ + -l$${OEM_PREFIX}ImgProc -l$${OEM_PREFIX}Version LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsane # sane.dll @@ -133,8 +133,8 @@ unix { QMAKE_LFLAGS += -z defs -B direct 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/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt \ + -l$${OEM_PREFIX2}ImgProc -l$${OEM_PREFIX2}Version LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lsane-$${OEM_PREFIX3}sane } diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro index bf4d955d..0fe2e47f 100644 --- a/build2/qt/HGScanner/HGScanner.pro +++ b/build2/qt/HGScanner/HGScanner.pro @@ -96,8 +96,8 @@ win32 { } LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 - 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/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt \ + -l$${OEM_PREFIX}ImgProc LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsane # sane.dll @@ -137,8 +137,8 @@ unix { QMAKE_LFLAGS += -z defs -B direct 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/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt \ + -l$${OEM_PREFIX2}ImgProc LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lsane-$${OEM_PREFIX3}sane -llang }