From 71953fe553136962f4d151ae3d519326565e30a4 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@@qq.com>
Date: Thu, 16 Mar 2023 10:26:54 +0800
Subject: [PATCH] =?UTF-8?q?rpath=E8=B7=AF=E5=BE=84=E6=94=B9=E4=B8=BAelf?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=BD=93=E5=89=8D=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro | 2 +-
 build-qt/HGSolution/HGScanner/HGScanner.pro     | 2 +-
 build-qt/HGSolution/HGUpgrade/HGUpgrade.pro     | 2 +-
 build/linux/HGBase/HGBase.cbp                   | 7 +++++--
 build/linux/HGImgFmt/HGImgFmt.cbp               | 7 +++++--
 build/linux/HGImgProc/HGImgProc.cbp             | 4 ++--
 build/linux/HGSaneUser/HGSaneUser.cbp           | 1 +
 build/linux/HGScannerLib/HGScannerLib.cbp       | 2 +-
 build/linux/HGTest/HGTest.cbp                   | 2 +-
 build/linux/HGUpload/HGUpload.cbp               | 8 ++++----
 build/linux/HGVersion/HGVersion.cbp             | 2 +-
 build/linux/HGWebScan/HGWebScan.cbp             | 2 +-
 build/linux/HGWebService/HGWebService.cbp       | 2 +-
 13 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro
index f4e53574..edb364a8 100644
--- a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro
+++ b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro
@@ -132,7 +132,7 @@ unix {
         message($$DISTRIBUTION)
         ARCH = $$system(arch)
         message($$ARCH)
-        QMAKE_LFLAGS += -Wl,-rpath=.
+        QMAKE_LFLAGS += -Wl,-rpath=\'\$\$ORIGIN\'
 
         if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG){
diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro
index 2c57691b..dd582947 100644
--- a/build-qt/HGSolution/HGScanner/HGScanner.pro
+++ b/build-qt/HGSolution/HGScanner/HGScanner.pro
@@ -132,7 +132,7 @@ unix {
         message($$DISTRIBUTION)
         ARCH = $$system(arch)
         message($$ARCH)
-        QMAKE_LFLAGS += -Wl,-rpath=.
+        QMAKE_LFLAGS += -Wl,-rpath=\'\$\$ORIGIN\'
 
         if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG){
diff --git a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro
index 40020b4c..33d659f4 100644
--- a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro
+++ b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro
@@ -95,7 +95,7 @@ unix {
         message($$DISTRIBUTION)
         ARCH = $$system(arch)
         message($$ARCH)
-        QMAKE_LFLAGS += -Wl,-rpath=.
+        QMAKE_LFLAGS += -Wl,-rpath=\'\$\$ORIGIN\'
 
         if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
             contains(DEFINES, OEM_HANWANG){
diff --git a/build/linux/HGBase/HGBase.cbp b/build/linux/HGBase/HGBase.cbp
index aae8d37b..725ea7e9 100644
--- a/build/linux/HGBase/HGBase.cbp
+++ b/build/linux/HGBase/HGBase.cbp
@@ -269,7 +269,7 @@
 			<Add option="-B direct" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../modules/base/HGBase.h" />
 		<Unit filename="../../../modules/base/HGBase64.cpp" />
@@ -316,6 +316,9 @@
 		<Unit filename="../../../modules/base/HGUtility.cpp" />
 		<Unit filename="../../../modules/base/HGUtility.h" />
 		<Unit filename="../../../modules/base/dllmain.cpp" />
-		<Extensions />
+		<Extensions>
+			<code_completion />
+			<debugger />
+		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/linux/HGImgFmt/HGImgFmt.cbp b/build/linux/HGImgFmt/HGImgFmt.cbp
index 61527826..0bfefeb0 100644
--- a/build/linux/HGImgFmt/HGImgFmt.cbp
+++ b/build/linux/HGImgFmt/HGImgFmt.cbp
@@ -539,7 +539,7 @@
 			<Add option="-B direct" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../modules/imgfmt/HGBmp.cpp" />
 		<Unit filename="../../../modules/imgfmt/HGBmp.h" />
@@ -566,6 +566,9 @@
 		<Unit filename="../../../modules/imgfmt/HGTiff.h" />
 		<Unit filename="../../../utility/HGString.cpp" />
 		<Unit filename="../../../utility/HGString.h" />
-		<Extensions />
+		<Extensions>
+			<code_completion />
+			<debugger />
+		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/linux/HGImgProc/HGImgProc.cbp b/build/linux/HGImgProc/HGImgProc.cbp
index 47df2342..02b6cc55 100644
--- a/build/linux/HGImgProc/HGImgProc.cbp
+++ b/build/linux/HGImgProc/HGImgProc.cbp
@@ -546,8 +546,8 @@
 			</Target>
 		</Build>
 		<Compiler>
-			<Add option="-Wall" />
 			<Add option="-std=c++11" />
+			<Add option="-Wall" />
 			<Add option="-fPIC" />
 			<Add option="-fvisibility=hidden" />
 		</Compiler>
@@ -557,7 +557,7 @@
 			<Add option="-B direct" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../modules/imgproc/CvxText.cpp" />
 		<Unit filename="../../../modules/imgproc/CvxText.hpp" />
diff --git a/build/linux/HGSaneUser/HGSaneUser.cbp b/build/linux/HGSaneUser/HGSaneUser.cbp
index 7ac41314..f2970525 100644
--- a/build/linux/HGSaneUser/HGSaneUser.cbp
+++ b/build/linux/HGSaneUser/HGSaneUser.cbp
@@ -216,6 +216,7 @@
 		<Linker>
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../modules/sane_user/HGSane.cpp" />
 		<Unit filename="../../../modules/sane_user/HGSane.h" />
diff --git a/build/linux/HGScannerLib/HGScannerLib.cbp b/build/linux/HGScannerLib/HGScannerLib.cbp
index 58679755..a8dd8723 100644
--- a/build/linux/HGScannerLib/HGScannerLib.cbp
+++ b/build/linux/HGScannerLib/HGScannerLib.cbp
@@ -335,7 +335,7 @@
 			<Add option="-B direct" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../sdk/scannerlib/HGLibDeviceImpl.cpp" />
 		<Unit filename="../../../sdk/scannerlib/HGLibDeviceImpl.hpp" />
diff --git a/build/linux/HGTest/HGTest.cbp b/build/linux/HGTest/HGTest.cbp
index 4c13247d..8f448d33 100644
--- a/build/linux/HGTest/HGTest.cbp
+++ b/build/linux/HGTest/HGTest.cbp
@@ -254,7 +254,7 @@
 		<Linker>
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="main.cpp" />
 		<Extensions>
diff --git a/build/linux/HGUpload/HGUpload.cbp b/build/linux/HGUpload/HGUpload.cbp
index 9095da64..f3550d58 100644
--- a/build/linux/HGUpload/HGUpload.cbp
+++ b/build/linux/HGUpload/HGUpload.cbp
@@ -235,7 +235,7 @@
 			<Add option="-B direct" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../modules/base/HGConsole.cpp" />
 		<Unit filename="../../../modules/base/HGConsole.h" />
@@ -243,12 +243,12 @@
 		<Unit filename="../../../modules/base/HGInfo.h" />
 		<Unit filename="../../../modules/base/HGInfoImpl.cpp" />
 		<Unit filename="../../../modules/base/HGInfoImpl.h" />
+		<Unit filename="../../../modules/base/HGIni.cpp" />
+		<Unit filename="../../../modules/base/HGIni.h" />
 		<Unit filename="../../../modules/base/HGLock.cpp" />
 		<Unit filename="../../../modules/base/HGLock.h" />
 		<Unit filename="../../../modules/base/HGLog.cpp" />
-		<Unit filename="../../../modules/base/HGLog.h" />	
-		<Unit filename="../../../modules/base/HGIni.cpp" />
-		<Unit filename="../../../modules/base/HGIni.h" />
+		<Unit filename="../../../modules/base/HGLog.h" />
 		<Unit filename="../../../modules/base/HGUtility.cpp" />
 		<Unit filename="../../../modules/base/HGUtility.h" />
 		<Unit filename="../../../sdk/upload/main.cpp" />
diff --git a/build/linux/HGVersion/HGVersion.cbp b/build/linux/HGVersion/HGVersion.cbp
index 8bb8d007..ed64a9ab 100644
--- a/build/linux/HGVersion/HGVersion.cbp
+++ b/build/linux/HGVersion/HGVersion.cbp
@@ -332,7 +332,7 @@
 			<Add option="-B direct" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../modules/version/HGVersion.cpp" />
 		<Unit filename="../../../modules/version/HGVersion.h" />
diff --git a/build/linux/HGWebScan/HGWebScan.cbp b/build/linux/HGWebScan/HGWebScan.cbp
index 7b535b3e..69c7dc88 100644
--- a/build/linux/HGWebScan/HGWebScan.cbp
+++ b/build/linux/HGWebScan/HGWebScan.cbp
@@ -383,7 +383,7 @@
 			<Add option="-ldl" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../sdk/webscan/HttpHead.cpp" />
 		<Unit filename="../../../sdk/webscan/HttpHead.h" />
diff --git a/build/linux/HGWebService/HGWebService.cbp b/build/linux/HGWebService/HGWebService.cbp
index b333236e..6bdece24 100644
--- a/build/linux/HGWebService/HGWebService.cbp
+++ b/build/linux/HGWebService/HGWebService.cbp
@@ -383,7 +383,7 @@
 			<Add option="-ldl" />
 			<Add option="-static-libgcc" />
 			<Add option="-static-libstdc++" />
-			<Add option="-Wl,-rpath=." />
+			<Add option="-Wl,-rpath,&apos;$$ORIGIN&apos;" />
 		</Linker>
 		<Unit filename="../../../sdk/webservice/HttpHead.cpp" />
 		<Unit filename="../../../sdk/webservice/HttpHead.h" />