From 7cdbfa9bd2269d993a5040bd6610f7dc64c92cb0 Mon Sep 17 00:00:00 2001 From: modehua Date: Tue, 22 Aug 2023 12:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91=E5=90=8E?= =?UTF-8?q?=E5=9C=A8=E4=B8=AD=E6=A0=87=E9=BA=92=E9=BA=9F=E4=B8=8A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=90=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build2/qt/HGFWUpgrade/HGFWUpgrade.pro | 4 +--- build2/qt/HGScanner2/HGScanner2.pro | 4 +--- build2/qt/HGTwainUI/HGTwainUI.pro | 4 +--- build2/qt/HGUpgrade/HGUpgrade.pro | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index e23622d9..d8c2c991 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -87,6 +87,7 @@ win32 { unix { + DEFINES += _GLIBCXX_USE_CXX11_ABI=0 DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) contains(DISTRIBUTION, UnionTech) { MY_OS = uos @@ -98,12 +99,10 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 MY_ARCH2 = x86_64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 MY_ARCH2 = aarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, mips64) { MY_ARCH = mips64 @@ -112,7 +111,6 @@ unix { contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 MY_ARCH2 = loongarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } CONFIG += unversioned_libname unversioned_soname diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro index 18e06cdc..777812c5 100644 --- a/build2/qt/HGScanner2/HGScanner2.pro +++ b/build2/qt/HGScanner2/HGScanner2.pro @@ -94,6 +94,7 @@ win32 { unix { + DEFINES += _GLIBCXX_USE_CXX11_ABI=0 DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) contains(DISTRIBUTION, UnionTech) { MY_OS = uos @@ -105,13 +106,11 @@ unix { DEFINES += x86_64 MY_ARCH = amd64 MY_ARCH2 = x86_64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, arm64) { DEFINES += aarch64 MY_ARCH = aarch64 MY_ARCH2 = aarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, mips64) { DEFINES += mips64 @@ -122,7 +121,6 @@ unix { DEFINES += loongarch64 MY_ARCH = loongarch64 MY_ARCH2 = loongarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } CONFIG += unversioned_libname unversioned_soname diff --git a/build2/qt/HGTwainUI/HGTwainUI.pro b/build2/qt/HGTwainUI/HGTwainUI.pro index 52c7fa3d..fd43ee49 100644 --- a/build2/qt/HGTwainUI/HGTwainUI.pro +++ b/build2/qt/HGTwainUI/HGTwainUI.pro @@ -62,6 +62,7 @@ win32 { unix { + DEFINES += _GLIBCXX_USE_CXX11_ABI=0 DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) contains(DISTRIBUTION, UnionTech) { MY_OS = uos @@ -73,12 +74,10 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 MY_ARCH2 = x86_64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 MY_ARCH2 = aarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, mips64) { MY_ARCH = mips64 @@ -87,7 +86,6 @@ unix { contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 MY_ARCH2 = loongarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } CONFIG += unversioned_libname unversioned_soname diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro index 17f4003e..1c4e75ba 100644 --- a/build2/qt/HGUpgrade/HGUpgrade.pro +++ b/build2/qt/HGUpgrade/HGUpgrade.pro @@ -82,6 +82,7 @@ win32 { unix { + DEFINES += _GLIBCXX_USE_CXX11_ABI=0 DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1) contains(DISTRIBUTION, UnionTech) { MY_OS = uos @@ -93,12 +94,10 @@ unix { contains(QT_ARCH, x86_64) { MY_ARCH = amd64 MY_ARCH2 = x86_64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, arm64) { MY_ARCH = aarch64 MY_ARCH2 = aarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } contains(QT_ARCH, mips64) { MY_ARCH = mips64 @@ -107,7 +106,6 @@ unix { contains(QT_ARCH, loongarch64) { MY_ARCH = loongarch64 MY_ARCH2 = loongarch64 - QMAKE_LFLAGS += -static-libstdc++ -static-libgcc } CONFIG += unversioned_libname unversioned_soname