lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

国产系统增加OEM美松达光电通

This commit is contained in:
luoliangyi 2024-08-29 18:33:52 +08:00
parent a10c0dd83a
commit d1edfd7ee4
3 changed files with 139 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
build.sh
View File

@ -448,7 +448,7 @@ elif [ "${1}" == "dlall" ] || [ "${1}" == "dl" ] || [ "${1}" == "dlweb" ] || [ "
if [ "${1}" == "neuall" ]; then
qmake -qt=qt5 -makefile "DEFINES += OEM_DELI" HGSolutionLinux.pro
qmake -qt=qt5 -makefile "DEFINES += OEM_NEUTRAL" HGSolutionLinux.pro
make -j8
else
@ -509,6 +509,138 @@ elif [ "${1}" == "dlall" ] || [ "${1}" == "dl" ] || [ "${1}" == "dlweb" ] || [ "
fi
fi
elif [ "${1}" == "msdall" ] || [ "${1}" == "msd" ] || [ "${1}" == "msdweb" ] || [ "${1}" == "msdso" ] || [ "${1}" == "msdtwain" ]; then
if [ "${1}" == "msdall" ]; then
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGSolutionLinux.pro
make -j8
else
cd HGBase
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGBase.pro
make -j8
cd ../
cd HGImgFmt
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGImgFmt.pro
make -j8
cd ../
cd HGImgProc
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGImgProc.pro
make -j8
cd ../
if [ "${1}" == "msd" ]; then
cd HGTwainUI
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGTwainUI.pro
make -j8
cd ../
cd HGSaneUser
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGSaneUser.pro
make -j8
cd ../
cd HGScanner2
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGScanner2.pro
make -j8
cd ../
mv "../../../release/${system}/${arch}/MaxsoundScan2" "../../../release/${system}/${arch}/MaxsoundScan"
elif [ "${1}" == "msdweb" ]; then
cd HGWebService
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGWebService.pro
make -j8
cd ../
elif [ "${1}" == "msdtwain" ]; then
cd HGTwainUI
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGTwainUI.pro
make -j8
cd ../
else
cd HGScannerLib
qmake -qt=qt5 -makefile "DEFINES += OEM_MEISONGDA" HGScannerLib.pro
make -j8
cd ../
fi
fi
elif [ "${1}" == "gdtall" ] || [ "${1}" == "gdt" ] || [ "${1}" == "gdtweb" ] || [ "${1}" == "gdtso" ] || [ "${1}" == "gdttwain" ]; then
if [ "${1}" == "gdtall" ]; then
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGSolutionLinux.pro
make -j8
else
cd HGBase
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGBase.pro
make -j8
cd ../
cd HGImgFmt
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGImgFmt.pro
make -j8
cd ../
cd HGImgProc
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGImgProc.pro
make -j8
cd ../
if [ "${1}" == "gdt" ]; then
cd HGTwainUI
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGTwainUI.pro
make -j8
cd ../
cd HGSaneUser
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGSaneUser.pro
make -j8
cd ../
cd HGScanner2
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGScanner2.pro
make -j8
cd ../
mv "../../../release/${system}/${arch}/ToecScan2" "../../../release/${system}/${arch}/ToecScan"
elif [ "${1}" == "gdtweb" ]; then
cd HGWebService
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGWebService.pro
make -j8
cd ../
elif [ "${1}" == "gdttwain" ]; then
cd HGTwainUI
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGTwainUI.pro
make -j8
cd ../
else
cd HGScannerLib
qmake -qt=qt5 -makefile "DEFINES += OEM_GUANGDIANTONG" HGScannerLib.pro
make -j8
cd ../
fi
fi
else

2
build2/qt/HGScanTool/HGScanTool.pro
View File

@ -100,7 +100,7 @@ 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_PREFIX2}ImgFmt -l$${OEM_PREFIX}ImgProc
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
LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lyuyanbao
LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lcommonlog

7
modules/sane_user/HGSaneImpl.cpp
View File

@ -275,7 +275,7 @@ void HGSaneManagerImpl::RemoveSource(class HGSaneSourceImpl* sourceImpl)
bool HGSaneManagerImpl::filterDeviceSource(const char *sourceName)
{
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI)
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI) && !defined(OEM_MEISONGDA) && !defined(OEM_GUANGDIANTONG)
std::string oemIden = "hgsane";
#elif defined(OEM_HANWANG)
std::string oemIden = "hwsane";
@ -291,6 +291,10 @@ bool HGSaneManagerImpl::filterDeviceSource(const char *sourceName)
std::string oemIden = "dlsane";
#elif defined(OEM_NEUTRAL)
std::string oemIden = "neusane";
#elif defined(OEM_MEISONGDA)
std::string oemIden = "msdsane";
#elif defined(OEM_GUANGDIANTONG)
std::string oemIden = "gdtsane";
#endif
if (sourceName != strstr(sourceName, oemIden.c_str()))
@ -301,7 +305,6 @@ bool HGSaneManagerImpl::filterDeviceSource(const char *sourceName)
return false;
}
HGSaneSourceImpl::HGSaneSourceImpl(HGSaneManagerImpl *managerImpl)
{
m_managerImpl = managerImpl;