diff --git a/build-qt/HGSolution/HGScanner.pro b/build-qt/HGSolution/HGScanner.pro index ab9dd40d..6b7642c9 100644 --- a/build-qt/HGSolution/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner.pro @@ -52,6 +52,7 @@ unix { message($$ARCH) contains(DISTRIBUTION, UnionTech){ + message('UOS') DEFINES += UOS contains(ARCH, x86_64){ LIBS += -L../../../release/uos/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver @@ -80,8 +81,8 @@ unix { } } - } - contains(DISTRIBUTION, Kylin){ + }else{ + message('KYLIN') DEFINES += KYLIN contains(ARCH, x86_64){ LIBS += -L../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver @@ -111,35 +112,6 @@ unix { } } } - contains(DISTRIBUTION, 方德桌面操作系统){ - contains(ARCH, x86_64){ - LIBS += -L../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver - CONFIG(release, debug|release) { - DESTDIR = ../../../release/kylin/x86_64/ - } - CONFIG(debug, debug|release) { - - } - } - contains(ARCH, aarch64){ - LIBS += -L../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver - CONFIG(release, debug|release) { - DESTDIR = ../../../release/kylin/aarch64/ - } - CONFIG(debug, debug|release) { - - } - } - contains(ARCH, mips64){ - LIBS += -L../../../release/kylin/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver - CONFIG(release, debug|release) { - DESTDIR = ../../../release/kylin/mips64/ - } - CONFIG(debug, debug|release) { - - } - } - } } INCLUDEPATH += $$PWD/../../app/scanner/ diff --git a/build.sh b/build.sh index 0e354dc5..e43711ab 100755 --- a/build.sh +++ b/build.sh @@ -14,11 +14,7 @@ echo $arch if [ ${systype} = "UnionTech" ] then system="uos" -elif [ ${systype} = "Kylin" ] -then - system="kylin" -elif [ ${systype} = "方德桌面操作系统" ] -then +else system="kylin" fi