diff --git a/app/scanner/Scanner_resource.qrc b/app/scanner/Scanner_resource.qrc index e7bd82ae..3c7d62ec 100644 --- a/app/scanner/Scanner_resource.qrc +++ b/app/scanner/Scanner_resource.qrc @@ -74,6 +74,7 @@ image_rsc/logo/HUAGO-LOGO-for UI.jpg image_rsc/logo/HUAGO-LOGO-for UI.png image_rsc/logo/Lanxum_logo.ico + image_rsc/logo/Cumtenn_logo.ico image_rsc/logo/logo.ico image_rsc/logo/NoBrand_logo.ico image_rsc/logo/RightWay_logo.ico diff --git a/app/scanner/VersionDll.cpp b/app/scanner/VersionDll.cpp index 8ac7fa5a..40688287 100644 --- a/app/scanner/VersionDll.cpp +++ b/app/scanner/VersionDll.cpp @@ -56,6 +56,8 @@ HGResult VersionDll::Load() strcat(dllPath, "HwVersion.dll"); #elif defined(OEM_LISICHENG) strcat(dllPath, "LscVersion.dll"); + #elif defined(OEM_CANGTIAN) + strcat(dllPath, "CtsVersion.dll"); #else strcat(dllPath, "HGVersion.dll"); #endif @@ -64,6 +66,8 @@ HGResult VersionDll::Load() strcpy(dllPath, "libHwVersion.so"); #elif defined(OEM_LISICHENG) strcpy(dllPath, "libLscVersion.so"); + #elif defined(OEM_CANGTIAN) + strcpy(dllPath, "libCtsVersion.so"); #else strcpy(dllPath, "libHGVersion.so"); #endif diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp index 2d523273..60a935eb 100644 --- a/app/scanner/dialog_aquireinto.cpp +++ b/app/scanner/dialog_aquireinto.cpp @@ -37,11 +37,13 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) : ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HWScan"))); #elif defined(OEM_LISICHENG) ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("LXScan"))); +#elif defined(OEM_CANGTIAN) + ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("CTSScan"))); #else ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan"))); #endif -#if defined(OEM_LISICHENG) || defined(x86_64) +#if defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(x86_64) ui->cbox_format->removeItem(11); ui->cbox_format->removeItem(10); #endif diff --git a/app/scanner/dialog_export.cpp b/app/scanner/dialog_export.cpp index b6047671..729a6d4f 100644 --- a/app/scanner/dialog_export.cpp +++ b/app/scanner/dialog_export.cpp @@ -25,7 +25,7 @@ static struct int attr; }g_support_type[] = { -#if defined(OEM_LISICHENG) || defined(x86_64) +#if defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(x86_64) {".jpg", "JPG - JPEG / JFIF", FILE_TYPE_ATTR_MORE_OPTIONS} , {".bmp", "BMP - Windows Bitmap", FILE_TYPE_ATTR_NO_MORE_OPTION} , {".png", "PNG - Portable Network Graphics", FILE_TYPE_ATTR_NO_MORE_OPTION} diff --git a/app/scanner/dialog_saveas.cpp b/app/scanner/dialog_saveas.cpp index a7d63194..120746d7 100644 --- a/app/scanner/dialog_saveas.cpp +++ b/app/scanner/dialog_saveas.cpp @@ -69,7 +69,7 @@ Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) : ui->fileDialog->setOption(QFileDialog::DontUseNativeDialog, true); ui->fileDialog->setOption(QFileDialog::ReadOnly, true); // disable 'Delete' menu item ui->fileDialog->setSizeGripEnabled(false); -#if defined(OEM_LISICHENG) || defined(x86_64) +#if defined(OEM_LISICHENG) || defined(OEM_CANGTIAN) || defined(x86_64) ui->fileDialog->setNameFilter("JPG - JPEG / JFIF(*.jpg);;" "BMP - Windows Bitmap(*.bmp);;" "PNG - Portable Network Graphics(*.png);;" diff --git a/app/scanner/image_rsc/logo/Cumtenn_logo.ico b/app/scanner/image_rsc/logo/Cumtenn_logo.ico new file mode 100644 index 00000000..62100d5b Binary files /dev/null and b/app/scanner/image_rsc/logo/Cumtenn_logo.ico differ diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 57d0df31..1ee470fe 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -88,6 +88,9 @@ MainWindow::MainWindow(QWidget *parent) this->setWindowIcon(QIcon(":images/image_rsc/logo/Lanxum_logo.ico")); this->setWindowTitle(tr("LanxumScan")); auto_save_changes_ = true; +#elif defined(OEM_CANGTIAN) + this->setWindowIcon(QIcon(":images/image_rsc/logo/Cumtenn_logo.ico")); + this->setWindowTitle(tr("CumtennScan")); #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowTitle(tr("HuaGoScan")); @@ -293,6 +296,8 @@ MainWindow::MainWindow(QWidget *parent) m_password = "hanvonscan"; #elif defined(OEM_LISICHENG) m_password = "lanxum"; +#elif defined(OEM_CANGTIAN) + m_password = "cumtenn"; #else m_password = "huagoscan"; #endif @@ -2894,6 +2899,8 @@ void MainWindow::on_act_help_triggered() QString filename = QApplication::applicationDirPath() + "/HanvonScan_App_Help_manual.pdf"; #elif defined(OEM_LISICHENG) QString filename = QApplication::applicationDirPath() + "/LanxumScan_App_Help_manual.pdf"; + #elif defined(OEM_CANGTIAN) + QString filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual.pdf"; #else QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; #endif @@ -2903,6 +2910,8 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_App_Help_manual.pdf"; #elif defined(OEM_LISICHENG) QString filename = "/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_App_Help_manual.pdf"; + #elif defined(OEM_CANGTIAN) + QString filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf"; #else QString filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf"; #endif @@ -2911,6 +2920,8 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf"; #elif defined(OEM_LISICHENG) QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf"; + #elif defined(OEM_CANGTIAN) + QString filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf"; #else QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -2919,6 +2930,8 @@ void MainWindow::on_act_help_triggered() QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf"; #elif defined(OEM_LISICHENG) QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf"; + #elif defined(OEM_CANGTIAN) + QString filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf"; #else QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3530,6 +3543,13 @@ void MainWindow::upgradeApp(QString pkgPath) QFile::copy(curPath + "LscBase.dll", tmpPath + "LscBase.dll"); QFile::remove(tmpPath + "LscVersion.dll"); QFile::copy(curPath + "LscVersion.dll", tmpPath + "LscVersion.dll"); + #elif defined(OEM_CANGTIAN) + QFile::remove(tmpPath + "CtsUpgradeApp.exe"); + QFile::copy(curPath + "CtsUpgradeApp.exe", tmpPath + "CtsUpgradeApp.exe"); + QFile::remove(tmpPath + "CtsBase.dll"); + QFile::copy(curPath + "CtsBase.dll", tmpPath + "CtsBase.dll"); + QFile::remove(tmpPath + "CtsVersion.dll"); + QFile::copy(curPath + "CtsVersion.dll", tmpPath + "CtsVersion.dll"); #else QFile::remove(tmpPath + "HGUpgradeApp.exe"); QFile::copy(curPath + "HGUpgradeApp.exe", tmpPath + "HGUpgradeApp.exe"); @@ -3571,6 +3591,13 @@ void MainWindow::upgradeApp(QString pkgPath) //QFile::copy(curPath + "libLscBase.so", tmpPath + "libLscBase.so"); //QFile::remove(tmpPath + "libLscVersion.so"); //QFile::copy(curPath + "libLscVersion.so", tmpPath + "libLscVersion.so"); + #elif defined(OEM_CANGTIAN) + QFile::remove(tmpPath + "CtsUpgradeApp"); + QFile::copy(curPath + "CtsUpgradeApp", tmpPath + "CtsUpgradeApp"); + //QFile::remove(tmpPath + "libCtsBase.so"); + //QFile::copy(curPath + "libCtsBase.so", tmpPath + "libCtsBase.so"); + //QFile::remove(tmpPath + "libCtsVersion.so"); + //QFile::copy(curPath + "libCtsVersion.so", tmpPath + "libCtsVersion.so"); #else QFile::remove(tmpPath + "HGUpgradeApp"); QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp"); @@ -3594,6 +3621,8 @@ void MainWindow::upgradeApp(QString pkgPath) isSuccessdStart = proc.startDetached(tmpPath + "HwUpgradeApp.exe", argList); #elif defined(OEM_LISICHENG) isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp.exe", argList); + #elif defined(OEM_CANGTIAN) + isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList); #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList); #endif @@ -3602,6 +3631,8 @@ void MainWindow::upgradeApp(QString pkgPath) isSuccessdStart = proc.startDetached(tmpPath + "HwUpgradeApp", argList); #elif defined(OEM_LISICHENG) isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp", argList); + #elif defined(OEM_CANGTIAN) + isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList); #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList); #endif diff --git a/build.bat b/build.bat index c8bb3ead..0ff1b1ac 100644 --- a/build.bat +++ b/build.bat @@ -8,7 +8,11 @@ if "%OEM%" == "hw" ( if "%OEM%" == "lsc" ( MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=LSCRelease /p:Platform=%ARCH% ) else ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=Release /p:Platform=%ARCH% + if "%OEM%" == "cts" ( + MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=CTSRelease /p:Platform=%ARCH% + ) else ( + MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=Release /p:Platform=%ARCH% + ) ) ) @@ -44,12 +48,28 @@ if "%OEM%" == "hw" ( ) MSBuild.exe LanxumScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( - if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + if "%OEM%" == "cts" ( + sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGScannerTmp.pro + sed -i "s/HuaGoScan/CumtennScan/g" HGScannerTmp.pro + sed -i "s/huagao/cumtenn/g" HGScannerTmp.pro + sed -i "s/HGBase/CTSBase/g" HGScannerTmp.pro + sed -i "s/HGImgFmt/CTSImgFmt/g" HGScannerTmp.pro + sed -i "s/HGImgProc/CTSImgProc/g" HGScannerTmp.pro + sed -i "s/logo.ico/Cumtenn_logo.ico/g" HGScannerTmp.pro + if "%ARCH%" == "x64" ( + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + ) else ( + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + ) + MSBuild.exe CumtennScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + if "%ARCH%" == "x64" ( + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScannerTmp.pro + ) else ( + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScannerTmp.pro + ) + MSBuild.exe HuaGoScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) - MSBuild.exe HuaGoScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) ) del /f /s /q *.h @@ -92,12 +112,26 @@ if "%OEM%" == "hw" ( ) MSBuild.exe LSCUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( - if "%ARCH%" == "x64" ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + if "%OEM%" == "cts" ( + sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGUpgradeTmp.pro + sed -i "s/HGUpgradeApp/CTSUpgradeApp/g" HGUpgradeTmp.pro + sed -i "s/HGBase/CTSBase/g" HGUpgradeTmp.pro + sed -i "s/HGVersion/CTSVersion/g" HGUpgradeTmp.pro + sed -i "s/logo.ico/Cumtenn_logo.ico/g" HGUpgradeTmp.pro + if "%ARCH%" == "x64" ( + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + ) else ( + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + ) + MSBuild.exe CTSUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + if "%ARCH%" == "x64" ( + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgradeTmp.pro + ) else ( + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgradeTmp.pro + ) + MSBuild.exe HGUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) - MSBuild.exe HGUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) ) del /f /s /q *.h diff --git a/build/windows/HGBase/HGBase.vcxproj b/build/windows/HGBase/HGBase.vcxproj index a8089561..43c5a646 100644 --- a/build/windows/HGBase/HGBase.vcxproj +++ b/build/windows/HGBase/HGBase.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -121,6 +129,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -148,6 +163,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -165,6 +187,9 @@ + + + @@ -177,6 +202,9 @@ + + + true @@ -192,6 +220,10 @@ false LSCBase + + false + CTSBase + true @@ -206,6 +238,10 @@ false LSCBase + + false + CTSBase + Level3 @@ -315,6 +351,35 @@ copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\bas copy $(OutDir)LSCBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGBASE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + + + Windows + true + true + true + false + HGBase.def + gdiplus.lib;dbghelp.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)CTSBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\ +copy $(OutDir)CTSBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -424,6 +489,35 @@ copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\bas copy $(OutDir)LSCBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGBASE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + + + Windows + true + true + true + false + HGBase.def + gdiplus.lib;dbghelp.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)CTSBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\ +copy $(OutDir)CTSBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build/windows/HGImgFmt/HGImgFmt.vcxproj b/build/windows/HGImgFmt/HGImgFmt.vcxproj index 58c10812..4c92e7ac 100644 --- a/build/windows/HGImgFmt/HGImgFmt.vcxproj +++ b/build/windows/HGImgFmt/HGImgFmt.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -101,6 +109,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -128,6 +143,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -145,6 +167,9 @@ + + + @@ -157,6 +182,9 @@ + + + true @@ -172,6 +200,10 @@ false LSCImgFmt + + false + CTSImgFmt + true @@ -186,6 +218,10 @@ false LSCImgFmt + + false + CTSImgFmt + Level3 @@ -297,6 +333,36 @@ copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\i copy $(OutDir)LSCImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGIMGFMT_EXPORTS;_WINDOWS;_USRDLL;ZIP_STATIC;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/giflib/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGImgFmt.def + ../CTSRelease/CTSBase.lib;../../../third_party/libjpeg/windows/lib/x86/jpeg.lib;../../../third_party/libnsbmp/windows/lib/x86/libnsbmp.lib;../../../third_party/libpng/windows/lib/x86/libpng16.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libtiff/windows/lib/x86/tiff.lib;../../../third_party/giflib/windows/lib/x86/giflib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/tinyxml2/windows/lib/x86/tinyxml2.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)CTSImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\ +copy $(OutDir)CTSImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -409,6 +475,36 @@ copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\i copy $(OutDir)LSCImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGIMGFMT_EXPORTS;_WINDOWS;_USRDLL;ZIP_STATIC;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/giflib/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGImgFmt.def + ../x64/CTSRelease/CTSBase.lib;../../../third_party/libjpeg/windows/lib/x64/jpeg.lib;../../../third_party/libnsbmp/windows/lib/x64/libnsbmp.lib;../../../third_party/libpng/windows/lib/x64/libpng16.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libtiff/windows/lib/x64/tiff.lib;../../../third_party/giflib/windows/lib/x64/giflib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/tinyxml2/windows/lib/x64/tinyxml2.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)CTSImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\ +copy $(OutDir)CTSImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build/windows/HGImgProc/HGImgProc.vcxproj b/build/windows/HGImgProc/HGImgProc.vcxproj index 3ac59c17..a8f4dcfd 100644 --- a/build/windows/HGImgProc/HGImgProc.vcxproj +++ b/build/windows/HGImgProc/HGImgProc.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -119,6 +127,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -146,6 +161,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -163,6 +185,9 @@ + + + @@ -175,6 +200,9 @@ + + + true @@ -190,6 +218,10 @@ false LSCImgProc + + false + CTSImgProc + true @@ -204,6 +236,10 @@ false LSCImgProc + + false + CTSImgProc + Level3 @@ -318,6 +354,37 @@ copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)LSCImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGIMGPROC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/opencv/windows/include;../../../third_party/freetype/windows/include;../../../third_party/ocr/hanvon/windows/include;../../../third_party/ocr/tesseract-ocr/windows/include;../../../utility;%(AdditionalIncludeDirectories) + 4244;%(DisableSpecificWarnings) + + + Windows + true + true + true + false + HGImgProc.def + ../CTSRelease/CTSBase.lib;../CTSRelease/CTSImgFmt.lib;../../../third_party/opencv/windows/lib/x86/opencv_core3416.lib;../../../third_party/opencv/windows/lib/x86/opencv_highgui3416.lib;../../../third_party/opencv/windows/lib/x86/opencv_features2d3416.lib;../../../third_party/opencv/windows/lib/x86/opencv_imgproc3416.lib;../../../third_party/opencv/windows/lib/x86/ittnotify.lib;../../../third_party/opencv/windows/lib/x86/zlib.lib;../../../third_party/freetype/windows/lib/x86/freetype.lib;../../../third_party/leptonica/windows/lib/x86/leptonica-1.74.4.lib;../../../third_party/ocr/tesseract-ocr/windows/lib/x86/tesseract41.lib;../../../third_party/libpng/windows/lib/x86/libpng16.lib;../../../third_party/libtiff/windows/lib/x86/tiff.lib;../../../third_party/libjpeg/windows/lib/x86/jpeg.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)CTSImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\ +copy $(OutDir)CTSImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -432,6 +499,37 @@ copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)LSCImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGIMGPROC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/opencv/windows/include;../../../third_party/freetype/windows/include;../../../third_party/ocr/hanvon/windows/include;../../../third_party/ocr/tesseract-ocr/windows/include;../../../utility;%(AdditionalIncludeDirectories) + 4244;4267;%(DisableSpecificWarnings) + + + Windows + true + true + true + false + HGImgProc.def + ../x64/CTSRelease/CTSBase.lib;../x64/CTSRelease/CTSImgFmt.lib;../../../third_party/opencv/windows/lib/x64/opencv_core3416.lib;../../../third_party/opencv/windows/lib/x64/opencv_highgui3416.lib;../../../third_party/opencv/windows/lib/x64/opencv_features2d3416.lib;../../../third_party/opencv/windows/lib/x64/opencv_imgproc3416.lib;../../../third_party/opencv/windows/lib/x64/ittnotify.lib;../../../third_party/opencv/windows/lib/x64/zlib.lib;../../../third_party/freetype/windows/lib/x64/freetype.lib;../../../third_party/leptonica/windows/lib/x64/leptonica-1.74.4.lib;../../../third_party/ocr/tesseract-ocr/windows/lib/x64/tesseract41.lib;../../../third_party/libpng/windows/lib/x64/libpng16.lib;../../../third_party/libtiff/windows/lib/x64/tiff.lib;../../../third_party/libjpeg/windows/lib/x64/jpeg.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)CTSImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\ +copy $(OutDir)CTSImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build/windows/HGSaneUser/HGSaneUser.vcxproj b/build/windows/HGSaneUser/HGSaneUser.vcxproj index e818f6b4..5db321f4 100644 --- a/build/windows/HGSaneUser/HGSaneUser.vcxproj +++ b/build/windows/HGSaneUser/HGSaneUser.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -81,6 +89,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -108,6 +123,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -125,6 +147,9 @@ + + + @@ -137,6 +162,9 @@ + + + true @@ -152,6 +180,10 @@ false LSCSaneUser + + false + CTSSaneUser + true @@ -166,6 +198,10 @@ false LSCSaneUser + + false + CTSSaneUser + Level3 @@ -269,6 +305,34 @@ + + + Level3 + true + true + true + WIN32;NDEBUG;HGSANEUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/sane/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGSaneUser.def + /LTCG %(AdditionalOptions) + ../CTSRelease/CTSBase.lib;%(AdditionalDependencies) + + + + + + Level3 @@ -372,6 +436,34 @@ + + + Level3 + true + true + true + NDEBUG;HGSANEUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/sane/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGSaneUser.def + /LTCG %(AdditionalOptions) + ../x64/CTSRelease/CTSBase.lib;%(AdditionalDependencies) + + + + + + diff --git a/build/windows/HGScannerLib/HGScannerLib.vcxproj b/build/windows/HGScannerLib/HGScannerLib.vcxproj index 52d2c923..c8900ee1 100644 --- a/build/windows/HGScannerLib/HGScannerLib.vcxproj +++ b/build/windows/HGScannerLib/HGScannerLib.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -82,6 +90,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -109,6 +124,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -126,6 +148,9 @@ + + + @@ -138,6 +163,9 @@ + + + true @@ -153,6 +181,10 @@ false LSCScannerLib + + false + CTSScannerLib + true @@ -167,6 +199,10 @@ false LSCScannerLib + + false + CTSScannerLib + Level3 @@ -279,6 +315,37 @@ copy $(SolutionDir)..\..\sdk\scannerlib\*.h $(SolutionDir)..\..\..\sdk\include\s copy $(OutDir)LSCScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGSCANNERLIB_EXPORTS;_WINDOWS;_USRDLL;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../modules/base/;../../../modules/;../../../utility/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGScannerLib.def + ../CTSRelease/CTSBase.lib;../CTSRelease/CTSImgFmt.lib;../CTSRelease/CTSImgProc.lib;../../../../sdk/lib/win/x86/OEM/cumtenn/sane.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSScannerLib.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)CTSScannerLib.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\base\HGDef.h $(SolutionDir)..\..\..\sdk\include\scannerlib\ +copy $(SolutionDir)..\..\sdk\scannerlib\*.h $(SolutionDir)..\..\..\sdk\include\scannerlib\ +copy $(OutDir)CTSScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -391,6 +458,37 @@ copy $(SolutionDir)..\..\sdk\scannerlib\*.h $(SolutionDir)..\..\..\sdk\include\s copy $(OutDir)LSCScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGSCANNERLIB_EXPORTS;_WINDOWS;_USRDLL;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../modules/base/;../../../modules/;../../../utility/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGScannerLib.def + ../x64/CTSRelease/CTSBase.lib;../x64/CTSRelease/CTSImgFmt.lib;../x64/CTSRelease/CTSImgProc.lib;../../../../sdk/lib/win/x64/OEM/cumtenn/sane.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSScannerLib.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)CTSScannerLib.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\base\HGDef.h $(SolutionDir)..\..\..\sdk\include\scannerlib\ +copy $(SolutionDir)..\..\sdk\scannerlib\*.h $(SolutionDir)..\..\..\sdk\include\scannerlib\ +copy $(OutDir)CTSScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build/windows/HGSolution.sln b/build/windows/HGSolution.sln index 30f72162..65212c8f 100644 --- a/build/windows/HGSolution.sln +++ b/build/windows/HGSolution.sln @@ -67,6 +67,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HGWebScan", "HGWebScan\HGWe EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + CTSRelease|x64 = CTSRelease|x64 + CTSRelease|x86 = CTSRelease|x86 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 HWRelease|x64 = HWRelease|x64 @@ -77,6 +79,10 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Debug|x64.ActiveCfg = Debug|x64 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Debug|x64.Build.0 = Debug|x64 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Debug|x86.ActiveCfg = Debug|Win32 @@ -93,6 +99,10 @@ Global {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Release|x64.Build.0 = Release|x64 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Release|x86.ActiveCfg = Release|Win32 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Release|x86.Build.0 = Release|Win32 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Debug|x64.ActiveCfg = Debug|x64 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Debug|x64.Build.0 = Debug|x64 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Debug|x86.ActiveCfg = Debug|Win32 @@ -109,6 +119,10 @@ Global {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Release|x64.Build.0 = Release|x64 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Release|x86.ActiveCfg = Release|Win32 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Release|x86.Build.0 = Release|Win32 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Debug|x64.ActiveCfg = Debug|x64 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Debug|x64.Build.0 = Debug|x64 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Debug|x86.ActiveCfg = Debug|Win32 @@ -125,6 +139,10 @@ Global {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Release|x64.Build.0 = Release|x64 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Release|x86.ActiveCfg = Release|Win32 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Release|x86.Build.0 = Release|Win32 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Debug|x64.ActiveCfg = Debug|x64 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Debug|x64.Build.0 = Debug|x64 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Debug|x86.ActiveCfg = Debug|Win32 @@ -141,6 +159,10 @@ Global {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Release|x64.Build.0 = Release|x64 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Release|x86.ActiveCfg = Release|Win32 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Release|x86.Build.0 = Release|Win32 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {BA4F1937-479E-463C-BB25-0DAC454DB625}.Debug|x64.ActiveCfg = Debug|x64 {BA4F1937-479E-463C-BB25-0DAC454DB625}.Debug|x64.Build.0 = Debug|x64 {BA4F1937-479E-463C-BB25-0DAC454DB625}.Debug|x86.ActiveCfg = Debug|Win32 @@ -157,6 +179,10 @@ Global {BA4F1937-479E-463C-BB25-0DAC454DB625}.Release|x64.Build.0 = Release|x64 {BA4F1937-479E-463C-BB25-0DAC454DB625}.Release|x86.ActiveCfg = Release|Win32 {BA4F1937-479E-463C-BB25-0DAC454DB625}.Release|x86.Build.0 = Release|Win32 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Debug|x64.ActiveCfg = Debug|x64 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Debug|x64.Build.0 = Debug|x64 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Debug|x86.ActiveCfg = Debug|Win32 @@ -173,6 +199,10 @@ Global {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Release|x64.Build.0 = Release|x64 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Release|x86.ActiveCfg = Release|Win32 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Release|x86.Build.0 = Release|Win32 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Debug|x64.ActiveCfg = Debug|x64 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Debug|x64.Build.0 = Debug|x64 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Debug|x86.ActiveCfg = Debug|Win32 @@ -189,6 +219,10 @@ Global {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Release|x64.Build.0 = Release|x64 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Release|x86.ActiveCfg = Release|Win32 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Release|x86.Build.0 = Release|Win32 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Debug|x64.ActiveCfg = Debug|x64 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Debug|x64.Build.0 = Debug|x64 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Debug|x86.ActiveCfg = Debug|Win32 @@ -205,6 +239,10 @@ Global {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Release|x64.Build.0 = Release|x64 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Release|x86.ActiveCfg = Release|Win32 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Release|x86.Build.0 = Release|Win32 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {25D00B63-9385-4283-8955-92CAAEDBE68A}.Debug|x64.ActiveCfg = Debug|x64 {25D00B63-9385-4283-8955-92CAAEDBE68A}.Debug|x64.Build.0 = Debug|x64 {25D00B63-9385-4283-8955-92CAAEDBE68A}.Debug|x86.ActiveCfg = Debug|Win32 @@ -221,6 +259,10 @@ Global {25D00B63-9385-4283-8955-92CAAEDBE68A}.Release|x64.Build.0 = Release|x64 {25D00B63-9385-4283-8955-92CAAEDBE68A}.Release|x86.ActiveCfg = Release|Win32 {25D00B63-9385-4283-8955-92CAAEDBE68A}.Release|x86.Build.0 = Release|Win32 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Debug|x64.ActiveCfg = Debug|x64 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Debug|x64.Build.0 = Debug|x64 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Debug|x86.ActiveCfg = Debug|Win32 @@ -237,6 +279,10 @@ Global {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Release|x64.Build.0 = Release|x64 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Release|x86.ActiveCfg = Release|Win32 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Release|x86.Build.0 = Release|Win32 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.CTSRelease|x64.Build.0 = CTSRelease|x64 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.CTSRelease|x86.ActiveCfg = CTSRelease|Win32 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.CTSRelease|x86.Build.0 = CTSRelease|Win32 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Debug|x64.ActiveCfg = Debug|x64 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Debug|x64.Build.0 = Debug|x64 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/build/windows/HGTest/HGTest.vcxproj b/build/windows/HGTest/HGTest.vcxproj index ee3249af..5c55c6f4 100644 --- a/build/windows/HGTest/HGTest.vcxproj +++ b/build/windows/HGTest/HGTest.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -73,6 +81,14 @@ Unicode Static + + Application + false + v142 + true + Unicode + Static + Application true @@ -104,6 +120,14 @@ Unicode Static + + Application + false + v142 + true + Unicode + Static + @@ -121,6 +145,9 @@ + + + @@ -133,6 +160,9 @@ + + + true @@ -151,6 +181,10 @@ false LSCTest + + false + CTSTest + false @@ -162,6 +196,10 @@ false LSCTest + + false + CTSTest + Use @@ -297,6 +335,35 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + true + true + true + WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) + pch.h + ../../../modules/base/;../../../modules;../../../sdk;%(AdditionalIncludeDirectories) + + + Windows + true + true + /LTCG %(AdditionalOptions) + ../CTSRelease/CTSBase.lib;../CTSRelease/CTSImgFmt.lib;../CTSRelease/CTSImgProc.lib;../CTSRelease/CTSTwainUser.lib;../CTSRelease/CTSSaneUser.lib;../CTSRelease/CTSVersion.lib;../CTSRelease/CTSScannerLib.lib;%(AdditionalDependencies) + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -384,6 +451,35 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + true + true + true + _WINDOWS;NDEBUG;%(PreprocessorDefinitions) + pch.h + ../../../modules/base/;../../../modules;../../../sdk;%(AdditionalIncludeDirectories) + + + Windows + true + true + /LTCG %(AdditionalOptions) + ../x64/CTSRelease/CTSBase.lib;../x64/CTSRelease/CTSImgFmt.lib;../x64/CTSRelease/CTSImgProc.lib;../x64/CTSRelease/CTSTwainUser.lib;../x64/CTSRelease/CTSSaneUser.lib;../x64/CTSRelease/CTSVersion.lib;../x64/CTSRelease/CTSScannerLib.lib;%(AdditionalDependencies) + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + @@ -401,9 +497,11 @@ Create Create Create + Create Create Create Create + Create diff --git a/build/windows/HGTwainUser/HGTwainUser.vcxproj b/build/windows/HGTwainUser/HGTwainUser.vcxproj index a95652ff..c559f720 100644 --- a/build/windows/HGTwainUser/HGTwainUser.vcxproj +++ b/build/windows/HGTwainUser/HGTwainUser.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -82,6 +90,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -109,6 +124,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -126,6 +148,9 @@ + + + @@ -138,6 +163,9 @@ + + + true @@ -153,6 +181,10 @@ false LSCTwainUser + + false + CTSTwainUser + true @@ -167,6 +199,10 @@ false LSCTwainUser + + false + CTSTwainUser + Level3 @@ -270,6 +306,34 @@ + + + Level3 + true + true + true + WIN32;NDEBUG;HGTWAINUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/twain/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + ../CTSRelease/CTSBase.lib;%(AdditionalDependencies) + HGTwainUser.def + /LTCG %(AdditionalOptions) + + + + + + Level3 @@ -373,6 +437,34 @@ + + + Level3 + true + true + true + NDEBUG;HGTWAINUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/twain/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGTwainUser.def + ../x64/CTSRelease/CTSBase.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + + + + diff --git a/build/windows/HGUpload/HGUpload.vcxproj b/build/windows/HGUpload/HGUpload.vcxproj index fdaf1ccf..9e4ef0a2 100644 --- a/build/windows/HGUpload/HGUpload.vcxproj +++ b/build/windows/HGUpload/HGUpload.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -80,6 +88,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application true @@ -107,6 +122,13 @@ true Unicode + + Application + false + v142 + true + Unicode + @@ -124,6 +146,9 @@ + + + @@ -136,6 +161,9 @@ + + + true @@ -157,6 +185,11 @@ upload .cgi + + false + upload + .cgi + true upload @@ -177,6 +210,11 @@ upload .cgi + + false + upload + .cgi + Level3 @@ -264,6 +302,30 @@ + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/cgic/;%(AdditionalIncludeDirectories) + + + Console + true + true + true + /LTCG %(AdditionalOptions) + %(AdditionalDependencies) + + + + + + Level3 @@ -351,6 +413,30 @@ + + + Level3 + true + true + true + NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/cgic/;%(AdditionalIncludeDirectories) + + + Console + true + true + true + /LTCG %(AdditionalOptions) + %(AdditionalDependencies) + + + + + + diff --git a/build/windows/HGVersion/HGVersion.vcxproj b/build/windows/HGVersion/HGVersion.vcxproj index d9ad25be..f6b9d9d7 100644 --- a/build/windows/HGVersion/HGVersion.vcxproj +++ b/build/windows/HGVersion/HGVersion.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -83,6 +91,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary true @@ -110,6 +125,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + @@ -127,6 +149,9 @@ + + + @@ -139,6 +164,9 @@ + + + true @@ -154,6 +182,10 @@ false LSCVersion + + false + CTSVersion + true @@ -168,6 +200,10 @@ false LSCVersion + + false + CTSVersion + Level3 @@ -278,6 +314,36 @@ copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)LSCVersion.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGVERSION_EXPORTS;_WINDOWS;_USRDLL;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/libcurl/windows/include/;../../../third_party/json/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGVersion.def + ../CTSRelease/CTSBase.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;ws2_32.lib;wldap32.lib;Iphlpapi.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSVersion.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)CTSVersion.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\version\ +copy $(OutDir)CTSVersion.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -388,6 +454,36 @@ copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)LSCVersion.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGVERSION_EXPORTS;_WINDOWS;_USRDLL;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/libcurl/windows/include/;../../../third_party/json/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + false + HGVersion.def + ../x64/CTSRelease/CTSBase.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;ws2_32.lib;wldap32.lib;Iphlpapi.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)CTSVersion.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)CTSVersion.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\version\ +copy $(OutDir)CTSVersion.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build/windows/HGWebScan/HGWebScan.vcxproj b/build/windows/HGWebScan/HGWebScan.vcxproj index d46bfbe5..42a162d0 100644 --- a/build/windows/HGWebScan/HGWebScan.vcxproj +++ b/build/windows/HGWebScan/HGWebScan.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -91,6 +99,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application true @@ -118,6 +133,13 @@ true Unicode + + Application + false + v142 + true + Unicode + @@ -135,6 +157,9 @@ + + + @@ -147,6 +172,9 @@ + + + true @@ -162,6 +190,10 @@ false LSCWebScan + + false + CTSWebScan + true @@ -176,6 +208,10 @@ false LSCWebScan + + false + CTSWebScan + Level3 @@ -266,6 +302,30 @@ copy $(OutDir)LSCWebScan.exe $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sqlite/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + ../CTSRelease/CTSBase.lib;../CTSRelease/CTSImgFmt.lib;../CTSRelease/CTSImgProc.lib;../../../../sdk/lib/win/x86/OEM/cumtenn/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + RequireAdministrator + + + copy $(OutDir)CTSWebScan.exe $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -355,6 +415,30 @@ copy $(OutDir)LSCWebScan.exe $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sqlite/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + ../x64/CTSRelease/CTSBase.lib;../x64/CTSRelease/CTSImgFmt.lib;../x64/CTSRelease/CTSImgProc.lib;../../../../sdk/lib/win/x64/OEM/cumtenn/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + RequireAdministrator + + + copy $(OutDir)CTSWebScan.exe $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj index cf3d4516..db3475f4 100644 --- a/build/windows/HGWebService/HGWebService.vcxproj +++ b/build/windows/HGWebService/HGWebService.vcxproj @@ -1,6 +1,14 @@ + + CTSRelease + Win32 + + + CTSRelease + x64 + Debug Win32 @@ -112,6 +120,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application true @@ -139,6 +154,13 @@ true Unicode + + Application + false + v142 + true + Unicode + @@ -156,6 +178,9 @@ + + + @@ -168,6 +193,9 @@ + + + true @@ -183,6 +211,10 @@ false LSCWebService + + false + CTSWebService + true @@ -197,6 +229,10 @@ false LSCWebService + + false + CTSWebService + Level3 @@ -287,6 +323,30 @@ copy $(OutDir)LSCWebService.exe $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sqlite/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + ../CTSRelease/CTSBase.lib;../CTSRelease/CTSImgFmt.lib;../CTSRelease/CTSImgProc.lib;../../../../sdk/lib/win/x86/OEM/cumtenn/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + RequireAdministrator + + + copy $(OutDir)CTSWebService.exe $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -376,6 +436,30 @@ copy $(OutDir)LSCWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_CANGTIAN;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sqlite/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + ../x64/CTSRelease/CTSBase.lib;../x64/CTSRelease/CTSImgFmt.lib;../x64/CTSRelease/CTSImgProc.lib;../../../../sdk/lib/win/x64/OEM/cumtenn/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + RequireAdministrator + + + copy $(OutDir)CTSWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\ + + diff --git a/build_all.bat b/build_all.bat index 2c3f0951..e8aaa15b 100644 --- a/build_all.bat +++ b/build_all.bat @@ -16,4 +16,10 @@ echo "step5" call .\build.bat lsc x86 echo "step6" -call .\build.bat lsc x64 \ No newline at end of file +call .\build.bat lsc x64 + +echo "step7" +call .\build.bat cts x86 + +echo "step8" +call .\build.bat cts x64 \ No newline at end of file diff --git a/modules/version/HGVersionImpl.cpp b/modules/version/HGVersionImpl.cpp index 467e62f1..c2cb21d7 100644 --- a/modules/version/HGVersionImpl.cpp +++ b/modules/version/HGVersionImpl.cpp @@ -410,6 +410,8 @@ static std::string GetOemName() oemName = "Hanvon"; #elif defined(OEM_LISICHENG) oemName = "Lanxum"; +#elif defined(OEM_CANGTIAN) + oemName = "Cumtenn"; #else oemName = "Huago"; #endif @@ -427,6 +429,8 @@ static std::string GetCurrVersion(const std::string& appName) std::string regName = "SOFTWARE\\HanvonScan"; #elif defined(OEM_LISICHENG) std::string regName = "SOFTWARE\\LanxumScan"; +#elif defined(OEM_CANGTIAN) + std::string regName = "SOFTWARE\\CumtennScan"; #else std::string regName = "SOFTWARE\\HuaGoScan"; #endif @@ -453,6 +457,8 @@ static std::string GetCurrVersion(const std::string& appName) appName = "com.hanvonchina.hanvonscan"; #elif defined(OEM_LISICHENG) appName = "com.lanxumchina.lanxumscan"; +#elif defined(OEM_CANGTIAN) + appName = "com.cumtennchina.cumtennscan"; #else appName = "com.huagaochina.huagoscan"; #endif @@ -463,6 +469,8 @@ static std::string GetCurrVersion(const std::string& appName) appName = "scanner-driver-hanvon"; #elif defined(OEM_LISICHENG) appName = "scanner-driver-lanxum"; +#elif defined(OEM_CANGTIAN) + appName = "scanner-driver-cumtenn"; #else appName = "scanner-driver-huagao"; #endif