diff --git a/build.bat b/build.bat index d35442a8..35c90c79 100644 --- a/build.bat +++ b/build.bat @@ -14,7 +14,11 @@ if "%OEM%" == "hw" ( if "%OEM%" == "zj" ( MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=ZJRelease /p:Platform=%ARCH% ) else ( - MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=Release /p:Platform=%ARCH% + if "%OEM%" == "zg" ( + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=ZGRelease /p:Platform=%ARCH% + ) else ( + MSBuild.exe ./build/windows/HGSolution.sln /m:8 /p:Configuration=Release /p:Platform=%ARCH% + ) ) ) ) @@ -86,19 +90,36 @@ if "%OEM%" == "hw" ( MSBuild.exe MicrotekScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( - mkdir HGScanner32 - cp HGScanner/HGScanner.pro HGScanner32/HGScanner.pro - if "%ARCH%" == "x64" ( - mkdir HGScanner64 - cp HGScanner32/HGScanner.pro HGScanner64/HGScanner.pro - cd /d HGScanner64 - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro + if "%OEM%" == "zg" ( + mkdir ZGScanner32 + cp HGScanner/HGScanner.pro ZGScanner32/HGScanner.pro + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" ZGScanner32/HGScanner.pro + if "%ARCH%" == "x64" ( + mkdir ZGScanner64 + cp ZGScanner32/HGScanner.pro ZGScanner64/HGScanner.pro + cd /d ZGScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro + ) else ( + cd /d ZGScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro + ) + MSBuild.exe UniscanScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( - cd /d HGScanner32 - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro + mkdir HGScanner32 + cp HGScanner/HGScanner.pro HGScanner32/HGScanner.pro + if "%ARCH%" == "x64" ( + mkdir HGScanner64 + cp HGScanner32/HGScanner.pro HGScanner64/HGScanner.pro + cd /d HGScanner64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGScanner.pro + ) else ( + cd /d HGScanner32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro + ) + MSBuild.exe HuaGoScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) - MSBuild.exe HuaGoScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% - cd /d ../ ) ) ) @@ -168,19 +189,36 @@ if "%OEM%" == "hw" ( MSBuild.exe ZJUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( - mkdir HGUpgrade32 - cp HGUpgrade/HGUpgrade.pro HGUpgrade32/HGUpgrade.pro - if "%ARCH%" == "x64" ( - mkdir HGUpgrade64 - cp HGUpgrade32/HGUpgrade.pro HGUpgrade64/HGUpgrade.pro - cd /d HGUpgrade64 - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro + if "%OEM%" == "zg" ( + mkdir ZGUpgrade32 + cp HGUpgrade/HGUpgrade.pro ZGUpgrade32/HGUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" ZGUpgrade32/HGUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir ZGUpgrade64 + cp ZGUpgrade32/HGUpgrade.pro ZGUpgrade64/HGUpgrade.pro + cd /d ZGUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro + ) else ( + cd /d ZGUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro + ) + MSBuild.exe ZGUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( - cd /d HGUpgrade32 - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro + mkdir HGUpgrade32 + cp HGUpgrade/HGUpgrade.pro HGUpgrade32/HGUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir HGUpgrade64 + cp HGUpgrade32/HGUpgrade.pro HGUpgrade64/HGUpgrade.pro + cd /d HGUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGUpgrade.pro + ) else ( + cd /d HGUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGUpgrade.pro + ) + MSBuild.exe HGUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) - MSBuild.exe HGUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% - cd /d ../ ) ) ) @@ -250,19 +288,36 @@ if "%OEM%" == "hw" ( MSBuild.exe ZJFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( - mkdir HGFWUpgrade32 - cp HGFWUpgrade/HGFWUpgrade.pro HGFWUpgrade32/HGFWUpgrade.pro - if "%ARCH%" == "x64" ( - mkdir HGFWUpgrade64 - cp HGFWUpgrade32/HGFWUpgrade.pro HGFWUpgrade64/HGFWUpgrade.pro - cd /d HGFWUpgrade64 - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro + if "%OEM%" == "zg" ( + mkdir ZGFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro ZGFWUpgrade32/HGFWUpgrade.pro + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" ZGFWUpgrade32/HGFWUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir ZGFWUpgrade64 + cp ZGFWUpgrade32/HGFWUpgrade.pro ZGFWUpgrade64/HGFWUpgrade.pro + cd /d ZGFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro + ) else ( + cd /d ZGFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro + ) + MSBuild.exe ZGFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) else ( - cd /d HGFWUpgrade32 - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro + mkdir HGFWUpgrade32 + cp HGFWUpgrade/HGFWUpgrade.pro HGFWUpgrade32/HGFWUpgrade.pro + if "%ARCH%" == "x64" ( + mkdir HGFWUpgrade64 + cp HGFWUpgrade32/HGFWUpgrade.pro HGFWUpgrade64/HGFWUpgrade.pro + cd /d HGFWUpgrade64 + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGFWUpgrade.pro + ) else ( + cd /d HGFWUpgrade32 + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGFWUpgrade.pro + ) + MSBuild.exe HGFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + cd /d ../ ) - MSBuild.exe HGFWUpgradeApp.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% - cd /d ../ ) ) ) diff --git a/build.sh b/build.sh index 30e228c7..15ecf9eb 100755 --- a/build.sh +++ b/build.sh @@ -3,19 +3,22 @@ if [ "$1" != "hg" ] \ && [ "$1" != "hw" ] \ && [ "$1" != "cts" ] \ && [ "$1" != "zj" ] \ +&& [ "$1" != "zg" ] \ && [ "$1" != "hgweb" ] \ && [ "$1" != "lscweb" ] \ && [ "$1" != "hwweb" ] \ && [ "$1" != "ctsweb" ] \ && [ "$1" != "zjweb" ] \ +&& [ "$1" != "zgweb" ] \ && [ "$1" != "hgso" ] \ && [ "$1" != "lscso" ] \ && [ "$1" != "hwso" ] \ && [ "$1" != "ctsso" ] \ -&& [ "$1" != "zjso" ]; +&& [ "$1" != "zjso" ] \ +&& [ "$1" != "zgso" ]; then echo "APP脚本参数错误！！！" - echo "参数:华高:hg || hgweb || hgso 立思层:lsc || lscweb || lscso 汉王:hw || hwweb || hwso 沧田:cts || ctsweb || ctsso 中晶:zj || zjweb || zjso" + echo "参数:华高:hg || hgweb || hgso 立思层:lsc || lscweb || lscso 汉王:hw || hwweb || hwso 沧田:cts || ctsweb || ctsso 中晶:zj || zjweb || zjso 紫光:zg || zgweb || zgso" exit 1 fi @@ -60,6 +63,9 @@ elif [ "${1}" == "cts" ] || [ "${1}" == "ctsweb" ] || [ "${1}" == "ctsso" ]; the elif [ "${1}" == "zj" ] || [ "${1}" == "zjweb" ] || [ "${1}" == "zjso" ]; then prefix="Zj" prefix2="zj" +elif [ "${1}" == "zg" ] || [ "${1}" == "zgweb" ] || [ "${1}" == "zgso" ]; then + prefix="Zg" + prefix2="zg" fi echo ${prefix} @@ -127,7 +133,7 @@ fi # rm -rf obj # rm HGImgProcTmp.cbp -if [ "${1}" == "hgweb" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "lscweb" ] || [ "${1}" == "ctsweb" ] || [ "${1}" == "zjweb" ]; then +if [ "${1}" == "hgweb" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "lscweb" ] || [ "${1}" == "ctsweb" ] || [ "${1}" == "zjweb" ] || [ "${1}" == "zgweb" ]; then cd ../HGWebService cp HGWebService.cbp HGWebServiceTmp.cbp @@ -140,6 +146,8 @@ if [ "${1}" == "hgweb" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "lscweb" ] || [ sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGWebServiceTmp.cbp elif [ "${1}" == "zjweb" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGWebServiceTmp.cbp + elif [ "${1}" == "zgweb" ]; then + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" HGWebServiceTmp.cbp fi sed -i "s/-lHGBase/-l${prefix}Base/g" HGWebServiceTmp.cbp sed -i "s/-lHGImgFmt/-l${prefix}ImgFmt/g" HGWebServiceTmp.cbp @@ -163,6 +171,8 @@ if [ "${1}" == "hgweb" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "lscweb" ] || [ sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGWebScanTmp.cbp elif [ "${1}" == "zjweb" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGWebScanTmp.cbp + elif [ "${1}" == "zgweb" ]; then + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" HGWebScanTmp.cbp fi sed -i "s/-lHGBase/-l${prefix}Base/g" HGWebScanTmp.cbp sed -i "s/-lHGImgFmt/-l${prefix}ImgFmt/g" HGWebScanTmp.cbp @@ -175,7 +185,7 @@ if [ "${1}" == "hgweb" ] || [ "${1}" == "hwweb" ] || [ "${1}" == "lscweb" ] || [ rm -rf obj rm HGWebScanTmp.cbp -elif [ "${1}" == "hgso" ] || [ "${1}" == "hwso" ] || [ "${1}" == "lscso" ] || [ "${1}" == "ctsso" ] || [ "${1}" == "zjso" ]; then +elif [ "${1}" == "hgso" ] || [ "${1}" == "hwso" ] || [ "${1}" == "lscso" ] || [ "${1}" == "ctsso" ] || [ "${1}" == "zjso" ] || [ "${1}" == "zgso" ]; then cd ../HGScannerLib cp HGScannerLib.cbp HGScannerLibTmp.cbp @@ -188,6 +198,8 @@ elif [ "${1}" == "hgso" ] || [ "${1}" == "hwso" ] || [ "${1}" == "lscso" ] || [ sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGScannerLibTmp.cbp elif [ "${1}" == "zjso" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGScannerLibTmp.cbp + elif [ "${1}" == "zgso" ]; then + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" HGScannerLibTmp.cbp fi sed -i "s/-lHGBase/-l${prefix}Base/g" HGScannerLibTmp.cbp sed -i "s/-lHGImgFmt/-l${prefix}ImgFmt/g" HGScannerLibTmp.cbp @@ -214,6 +226,8 @@ else #APP sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGVersionTmp.cbp elif [ "${1}" == "zj" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGVersionTmp.cbp + elif [ "${1}" == "zg" ]; then + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" HGVersionTmp.cbp fi sed -i "s/-lHGBase/-l${prefix}Base/g" HGVersionTmp.cbp cbp2make -targets ${system}_${arch}_Release -in HGVersionTmp.cbp -out makefile @@ -232,7 +246,9 @@ else #APP elif [ "${1}" == "cts" ]; then sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGScannerTmp.pro elif [ "${1}" == "zj" ]; then - sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGScannerTmp.pro + sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGScannerTmp.pro + elif [ "${1}" == "zg" ]; then + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" HGScannerTmp.pro fi qmake -qt=qt5 -makefile HGScannerTmp.pro @@ -255,6 +271,8 @@ else #APP sed -i "s/OEM_HUAGAO/OEM_CANGTIAN/g" HGUpgradeTmp.pro elif [ "${1}" == "zj" ]; then sed -i "s/OEM_HUAGAO/OEM_ZHONGJING/g" HGUpgradeTmp.pro + elif [ "${1}" == "zg" ]; then + sed -i "s/OEM_HUAGAO/OEM_ZIGUANG/g" HGUpgradeTmp.pro fi qmake -qt=qt5 -makefile HGUpgradeTmp.pro diff --git a/build/windows/HGBase/HGBase.vcxproj b/build/windows/HGBase/HGBase.vcxproj index 09711919..9ffbee2a 100644 --- a/build/windows/HGBase/HGBase.vcxproj +++ b/build/windows/HGBase/HGBase.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -130,6 +138,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -171,6 +186,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -206,6 +228,9 @@ + + + @@ -224,6 +249,9 @@ + + + @@ -244,6 +272,10 @@ false HWBase + + false + ZGBase + false ZJBase @@ -266,6 +298,10 @@ false HWBase + + false + ZGBase + false ZJBase @@ -361,6 +397,36 @@ copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\bas copy $(OutDir)HWBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGBASE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + true + + + Windows + true + true + true + false + HGBase.def + gdiplus.lib;dbghelp.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)ZGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)ZGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\ +copy $(OutDir)ZGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -534,6 +600,36 @@ copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\bas copy $(OutDir)HWBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGBASE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + true + + + Windows + true + true + true + false + HGBase.def + gdiplus.lib;dbghelp.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)ZGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)ZGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\ +copy $(OutDir)ZGBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build/windows/HGImgFmt/HGImgFmt.vcxproj b/build/windows/HGImgFmt/HGImgFmt.vcxproj index 3140640f..deed173c 100644 --- a/build/windows/HGImgFmt/HGImgFmt.vcxproj +++ b/build/windows/HGImgFmt/HGImgFmt.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -110,6 +118,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -151,6 +166,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -186,6 +208,9 @@ + + + @@ -204,6 +229,9 @@ + + + @@ -224,6 +252,10 @@ false HWImgFmt + + false + ZGImgFmt + false ZJImgFmt @@ -246,6 +278,10 @@ false HWImgFmt + + false + ZGImgFmt + false ZJImgFmt @@ -342,6 +378,37 @@ copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\i copy $(OutDir)HWImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGIMGFZJ_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) + true + + + Windows + true + true + true + false + HGImgFmt.def + ../ZGRelease/ZGBase.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)ZGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)ZGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\ +copy $(OutDir)ZGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -520,6 +587,37 @@ copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\i copy $(OutDir)HWImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGIMGFZJ_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) + true + + + Windows + true + true + true + false + HGImgFmt.def + ../x64/ZGRelease/ZGBase.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)ZGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)ZGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\ +copy $(OutDir)ZGImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build/windows/HGImgProc/HGImgProc.vcxproj b/build/windows/HGImgProc/HGImgProc.vcxproj index ade86eb1..2941483e 100644 --- a/build/windows/HGImgProc/HGImgProc.vcxproj +++ b/build/windows/HGImgProc/HGImgProc.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -128,6 +136,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -169,6 +184,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -204,6 +226,9 @@ + + + @@ -222,6 +247,9 @@ + + + @@ -242,6 +270,10 @@ false HWImgProc + + false + ZGImgProc + false ZJImgProc @@ -264,6 +296,10 @@ false HWImgProc + + false + ZGImgProc + false ZJImgProc @@ -362,6 +398,38 @@ copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)HWImgProc.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) + true + + + Windows + true + true + true + false + HGImgProc.def + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.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)ZGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)ZGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\ +copy $(OutDir)ZGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -544,6 +612,38 @@ copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)HWImgProc.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) + true + + + Windows + true + true + true + false + HGImgProc.def + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.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)ZGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)ZGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\ +copy $(OutDir)ZGImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build/windows/HGSaneUser/HGSaneUser.vcxproj b/build/windows/HGSaneUser/HGSaneUser.vcxproj index 0c9254e3..ce50dbc0 100644 --- a/build/windows/HGSaneUser/HGSaneUser.vcxproj +++ b/build/windows/HGSaneUser/HGSaneUser.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -90,6 +98,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -131,6 +146,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -166,6 +188,9 @@ + + + @@ -184,6 +209,9 @@ + + + @@ -204,6 +232,10 @@ false HWSaneUser + + false + ZGSaneUser + false ZJSaneUser @@ -226,6 +258,10 @@ false HWSaneUser + + false + ZGSaneUser + false ZJSaneUser @@ -316,6 +352,35 @@ + + + Level3 + true + true + true + WIN32;NDEBUG;HGSANEUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/sane/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGSaneUser.def + /LTCG %(AdditionalOptions) + ../ZGRelease/ZGBase.lib;%(AdditionalDependencies) + + + + + + Level3 @@ -481,6 +546,35 @@ + + + Level3 + true + true + true + NDEBUG;HGSANEUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/sane/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGSaneUser.def + /LTCG %(AdditionalOptions) + ../x64/ZGRelease/ZGBase.lib;%(AdditionalDependencies) + + + + + + Level3 diff --git a/build/windows/HGScannerLib/HGScannerLib.vcxproj b/build/windows/HGScannerLib/HGScannerLib.vcxproj index 10e2dfc1..7534e639 100644 --- a/build/windows/HGScannerLib/HGScannerLib.vcxproj +++ b/build/windows/HGScannerLib/HGScannerLib.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -91,6 +99,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -132,6 +147,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -167,6 +189,9 @@ + + + @@ -185,6 +210,9 @@ + + + @@ -205,6 +233,10 @@ false HWScannerLib + + false + ZGScannerLib + false ZJScannerLib @@ -227,6 +259,10 @@ false HWScannerLib + + false + ZGScannerLib + false ZJScannerLib @@ -323,6 +359,38 @@ copy $(SolutionDir)..\..\sdk\scannerlib\*.h $(SolutionDir)..\..\..\sdk\include\s copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGSCANNERLIB_EXPORTS;_WINDOWS;_USRDLL;OEM_ZIGUANG;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../modules/base/;../../../modules/;../../../utility/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGScannerLib.def + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)ZGScannerLib.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)ZGScannerLib.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)ZGScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -503,6 +571,38 @@ copy $(SolutionDir)..\..\sdk\scannerlib\*.h $(SolutionDir)..\..\..\sdk\include\s copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGSCANNERLIB_EXPORTS;_WINDOWS;_USRDLL;OEM_ZIGUANG;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../modules/base/;../../../modules/;../../../utility/;../../../../sdk/include/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGScannerLib.def + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + copy $(OutDir)ZGScannerLib.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)ZGScannerLib.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)ZGScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build/windows/HGSolution.sln b/build/windows/HGSolution.sln index fc2d5657..3af1e38a 100644 --- a/build/windows/HGSolution.sln +++ b/build/windows/HGSolution.sln @@ -75,10 +75,12 @@ Global HWRelease|x86 = HWRelease|x86 LSCRelease|x64 = LSCRelease|x64 LSCRelease|x86 = LSCRelease|x86 - ZJRelease|x64 = ZJRelease|x64 - ZJRelease|x86 = ZJRelease|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 + ZGRelease|x64 = ZGRelease|x64 + ZGRelease|x86 = ZGRelease|x86 + ZJRelease|x64 = ZJRelease|x64 + ZJRelease|x86 = ZJRelease|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F85F4457-1B42-46E7-BA86-F088D6D5994F}.CTSRelease|x64.ActiveCfg = CTSRelease|x64 @@ -97,14 +99,18 @@ Global {F85F4457-1B42-46E7-BA86-F088D6D5994F}.LSCRelease|x64.Build.0 = LSCRelease|x64 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {F85F4457-1B42-46E7-BA86-F088D6D5994F}.Release|x64.ActiveCfg = Release|x64 {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 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {F85F4457-1B42-46E7-BA86-F088D6D5994F}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -121,14 +127,18 @@ Global {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.LSCRelease|x64.Build.0 = LSCRelease|x64 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.Release|x64.ActiveCfg = Release|x64 {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 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {BDF6F7E5-1AE8-4E40-83C0-8AF775838109}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -145,14 +155,18 @@ Global {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.LSCRelease|x64.Build.0 = LSCRelease|x64 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.Release|x64.ActiveCfg = Release|x64 {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 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {5D85F2AC-FACD-436C-A67B-E13056DD0C03}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -169,14 +183,18 @@ Global {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.LSCRelease|x64.Build.0 = LSCRelease|x64 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.Release|x64.ActiveCfg = Release|x64 {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 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {4954F36B-A0A3-4550-9C4E-3B3D210F5CE4}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -193,14 +211,18 @@ Global {BA4F1937-479E-463C-BB25-0DAC454DB625}.LSCRelease|x64.Build.0 = LSCRelease|x64 {BA4F1937-479E-463C-BB25-0DAC454DB625}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {BA4F1937-479E-463C-BB25-0DAC454DB625}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {BA4F1937-479E-463C-BB25-0DAC454DB625}.Release|x64.ActiveCfg = Release|x64 {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 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {BA4F1937-479E-463C-BB25-0DAC454DB625}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -217,14 +239,18 @@ Global {4909ACEA-80FF-482E-9FA2-5E8534789A82}.LSCRelease|x64.Build.0 = LSCRelease|x64 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {4909ACEA-80FF-482E-9FA2-5E8534789A82}.Release|x64.ActiveCfg = Release|x64 {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 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {4909ACEA-80FF-482E-9FA2-5E8534789A82}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -241,14 +267,18 @@ Global {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.LSCRelease|x64.Build.0 = LSCRelease|x64 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.Release|x64.ActiveCfg = Release|x64 {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 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {EFAE5F69-A4C2-4A07-8BE6-68714D86BCE2}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -265,14 +295,18 @@ Global {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.LSCRelease|x64.Build.0 = LSCRelease|x64 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.Release|x64.ActiveCfg = Release|x64 {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 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {FC39DAEA-2BB2-45AE-A7F3-F3879692A66B}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -289,14 +323,18 @@ Global {25D00B63-9385-4283-8955-92CAAEDBE68A}.LSCRelease|x64.Build.0 = LSCRelease|x64 {25D00B63-9385-4283-8955-92CAAEDBE68A}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {25D00B63-9385-4283-8955-92CAAEDBE68A}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {25D00B63-9385-4283-8955-92CAAEDBE68A}.Release|x64.ActiveCfg = Release|x64 {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 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {25D00B63-9385-4283-8955-92CAAEDBE68A}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -313,14 +351,18 @@ Global {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.LSCRelease|x64.Build.0 = LSCRelease|x64 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.Release|x64.ActiveCfg = Release|x64 {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 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {62CAD8E9-4461-49A1-8EB8-4CEBE113FE02}.ZJRelease|x86.Build.0 = ZJRelease|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 @@ -337,14 +379,18 @@ Global {2A4A0C71-D333-4978-B7C4-08401230E0A5}.LSCRelease|x64.Build.0 = LSCRelease|x64 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.LSCRelease|x86.ActiveCfg = LSCRelease|Win32 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.LSCRelease|x86.Build.0 = LSCRelease|Win32 - {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 - {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x64.Build.0 = ZJRelease|x64 - {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 - {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x86.Build.0 = ZJRelease|Win32 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Release|x64.ActiveCfg = Release|x64 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Release|x64.Build.0 = Release|x64 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Release|x86.ActiveCfg = Release|Win32 {2A4A0C71-D333-4978-B7C4-08401230E0A5}.Release|x86.Build.0 = Release|Win32 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZGRelease|x64.ActiveCfg = ZGRelease|x64 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZGRelease|x64.Build.0 = ZGRelease|x64 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZGRelease|x86.ActiveCfg = ZGRelease|Win32 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZGRelease|x86.Build.0 = ZGRelease|Win32 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x64.ActiveCfg = ZJRelease|x64 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x64.Build.0 = ZJRelease|x64 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x86.ActiveCfg = ZJRelease|Win32 + {2A4A0C71-D333-4978-B7C4-08401230E0A5}.ZJRelease|x86.Build.0 = ZJRelease|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/windows/HGTest/HGTest.vcxproj b/build/windows/HGTest/HGTest.vcxproj index 1aa6b2fa..95062309 100644 --- a/build/windows/HGTest/HGTest.vcxproj +++ b/build/windows/HGTest/HGTest.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -81,6 +89,14 @@ Unicode Static + + Application + false + v142 + true + Unicode + Static + Application false @@ -128,6 +144,14 @@ Unicode Static + + Application + false + v142 + true + Unicode + Static + Application false @@ -166,6 +190,9 @@ + + + @@ -184,6 +211,9 @@ + + + @@ -207,6 +237,10 @@ false HWTest + + false + ZGTest + false ZJTest @@ -226,6 +260,10 @@ false HWTest + + false + ZGTest + false ZJTest @@ -348,6 +386,36 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + true + true + true + WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) + pch.h + ../../../modules/base/;../../../modules;../../../sdk;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + /LTCG %(AdditionalOptions) + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../ZGRelease/ZGTwainUser.lib;../ZGRelease/ZGSaneUser.lib;../ZGRelease/ZGVersion.lib;../ZGRelease/ZGScannerLib.lib;%(AdditionalDependencies) + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -498,6 +566,36 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + true + true + true + _WINDOWS;NDEBUG;%(PreprocessorDefinitions) + pch.h + ../../../modules/base/;../../../modules;../../../sdk;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + /LTCG %(AdditionalOptions) + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../x64/ZGRelease/ZGTwainUser.lib;../x64/ZGRelease/ZGSaneUser.lib;../x64/ZGRelease/ZGVersion.lib;../x64/ZGRelease/ZGScannerLib.lib;%(AdditionalDependencies) + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -604,11 +702,13 @@ Create Create Create + Create Create Create Create Create Create + Create Create Create Create diff --git a/build/windows/HGTwainUser/HGTwainUser.vcxproj b/build/windows/HGTwainUser/HGTwainUser.vcxproj index 432c6bf3..e4de18bc 100644 --- a/build/windows/HGTwainUser/HGTwainUser.vcxproj +++ b/build/windows/HGTwainUser/HGTwainUser.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -91,6 +99,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -132,6 +147,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -167,6 +189,9 @@ + + + @@ -185,6 +210,9 @@ + + + @@ -205,6 +233,10 @@ false HWTwainUser + + false + ZGTwainUser + false ZJTwainUser @@ -227,6 +259,10 @@ false HWTwainUser + + false + ZGTwainUser + false ZJTwainUser @@ -317,6 +353,35 @@ + + + Level3 + true + true + true + WIN32;NDEBUG;HGTWAINUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/twain/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + ../ZGRelease/ZGBase.lib;%(AdditionalDependencies) + HGTwainUser.def + /LTCG %(AdditionalOptions) + + + + + + Level3 @@ -482,6 +547,35 @@ + + + Level3 + true + true + true + NDEBUG;HGTWAINUSER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/twain/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGTwainUser.def + ../x64/ZGRelease/ZGBase.lib;%(AdditionalDependencies) + /LTCG %(AdditionalOptions) + + + + + + Level3 diff --git a/build/windows/HGUpload/HGUpload.vcxproj b/build/windows/HGUpload/HGUpload.vcxproj index b6aecd71..ce39375f 100644 --- a/build/windows/HGUpload/HGUpload.vcxproj +++ b/build/windows/HGUpload/HGUpload.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -99,6 +107,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -140,6 +155,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -175,6 +197,9 @@ + + + @@ -193,6 +218,9 @@ + + + @@ -218,6 +246,11 @@ upload .cgi + + false + upload + .cgi + false upload @@ -248,6 +281,11 @@ upload .cgi + + false + upload + .cgi + false upload @@ -329,6 +367,31 @@ + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/cgic/;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + /LTCG %(AdditionalOptions) + %(AdditionalDependencies) + + + + + + Level3 @@ -470,6 +533,31 @@ + + + Level3 + true + true + true + NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + ../../../modules/;../../../third_party/cgic/;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + /LTCG %(AdditionalOptions) + %(AdditionalDependencies) + + + + + + Level3 diff --git a/build/windows/HGVersion/HGVersion.vcxproj b/build/windows/HGVersion/HGVersion.vcxproj index 49783feb..9a3366dc 100644 --- a/build/windows/HGVersion/HGVersion.vcxproj +++ b/build/windows/HGVersion/HGVersion.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -92,6 +100,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -133,6 +148,13 @@ true Unicode + + DynamicLibrary + false + v142 + true + Unicode + DynamicLibrary false @@ -168,6 +190,9 @@ + + + @@ -186,6 +211,9 @@ + + + @@ -206,6 +234,10 @@ false HWVersion + + false + ZGVersion + false ZJVersion @@ -228,6 +260,10 @@ false HWVersion + + false + ZGVersion + false ZJVersion @@ -323,6 +359,37 @@ copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)HWVersion.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + + Level3 + true + true + true + WIN32;NDEBUG;HGVERSION_EXPORTS;_WINDOWS;_USRDLL;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/libcurl/windows/include/;../../../third_party/json/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGVersion.def + ../ZGRelease/ZGBase.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;ws2_32.lib;wldap32.lib;Iphlpapi.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)ZGVersion.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(OutDir)ZGVersion.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\ +copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\version\ +copy $(OutDir)ZGVersion.dll $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -499,6 +566,37 @@ copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\ copy $(OutDir)HWVersion.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + + Level3 + true + true + true + NDEBUG;HGVERSION_EXPORTS;_WINDOWS;_USRDLL;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + NotUsing + pch.h + MultiThreaded + ../../../third_party/libcurl/windows/include/;../../../third_party/json/;%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + false + HGVersion.def + ../x64/ZGRelease/ZGBase.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;ws2_32.lib;wldap32.lib;Iphlpapi.lib;%(AdditionalDependencies) + /ignore:4099 /LTCG %(AdditionalOptions) + + + copy $(OutDir)ZGVersion.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(OutDir)ZGVersion.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\ +copy $(SolutionDir)..\..\modules\version\*.h $(SolutionDir)..\..\..\sdk\include\version\ +copy $(OutDir)ZGVersion.dll $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build/windows/HGWebScan/HGWebScan.vcxproj b/build/windows/HGWebScan/HGWebScan.vcxproj index 85bc5626..6cd527e9 100644 --- a/build/windows/HGWebScan/HGWebScan.vcxproj +++ b/build/windows/HGWebScan/HGWebScan.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -100,6 +108,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -141,6 +156,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -176,6 +198,9 @@ + + + @@ -194,6 +219,9 @@ + + + @@ -214,6 +242,10 @@ false HWWebScan + + false + ZGWebScan + false ZJWebScan @@ -236,6 +268,10 @@ false HWWebScan + + false + ZGWebScan + false ZJWebScan @@ -317,6 +353,31 @@ copy $(OutDir)HWWebScan.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_ZIGUANG;%(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) + true + + + Windows + true + true + true + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/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)ZGWebScan.exe $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -460,6 +521,31 @@ copy $(OutDir)HWWebScan.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_ZIGUANG;%(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) + true + + + Windows + true + true + true + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/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)ZGWebScan.exe $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj index d22208c4..47975577 100644 --- a/build/windows/HGWebService/HGWebService.vcxproj +++ b/build/windows/HGWebService/HGWebService.vcxproj @@ -29,6 +29,14 @@ LSCRelease x64 + + ZGRelease + Win32 + + + ZGRelease + x64 + ZJRelease Win32 @@ -121,6 +129,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -162,6 +177,13 @@ true Unicode + + Application + false + v142 + true + Unicode + Application false @@ -197,6 +219,9 @@ + + + @@ -215,6 +240,9 @@ + + + @@ -235,6 +263,10 @@ false HWWebService + + false + ZGWebService + false ZJWebService @@ -257,6 +289,10 @@ false HWWebService + + false + ZGWebService + false ZJWebService @@ -338,6 +374,31 @@ copy $(OutDir)HWWebService.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_ZIGUANG;%(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) + true + + + Windows + true + true + true + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/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)ZGWebService.exe $(SolutionDir)..\..\..\release\win\x86\Release\ + + Level3 @@ -481,6 +542,31 @@ copy $(OutDir)HWWebService.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_ZIGUANG;%(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) + true + + + Windows + true + true + true + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/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)ZGWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\ + + Level3 diff --git a/build_all.bat b/build_all.bat index dd9c3952..80e50d5f 100644 --- a/build_all.bat +++ b/build_all.bat @@ -28,4 +28,10 @@ echo "step9" call .\build.bat zj x86 echo "step10" -call .\build.bat zj x64 \ No newline at end of file +call .\build.bat zj x64 + +echo "step11" +call .\build.bat zg x86 + +echo "step12" +call .\build.bat zg x64 \ No newline at end of file diff --git a/modules/version/HGVersion.h b/modules/version/HGVersion.h index 7b9b1df1..996c28e2 100644 --- a/modules/version/HGVersion.h +++ b/modules/version/HGVersion.h @@ -13,6 +13,7 @@ HG_DECLARE_HANDLE(HGVersionMgr); #define HGVERSION_OEMNAME_LANXUM "Lanxum" #define HGVERSION_OEMNAME_CUMTENN "Cumtenn" #define HGVERSION_OEMNAME_MICROTEK "Microtek" +#define HGVERSION_OEMNAME_UNISCAN "Uniscan" #pragma pack(push) #pragma pack(4)