diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro index 4f70b7b6..ee012be1 100644 --- a/build-qt/HGSolution/HGScanner/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner/HGScanner.pro @@ -36,7 +36,7 @@ win32 { } } - else { + contains(QT_ARCH, x86_64){ LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao -lsane CONFIG(release, debug|release) { diff --git a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro index 51024c30..e9e152fd 100644 --- a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro +++ b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro @@ -35,7 +35,7 @@ win32 { } } - else { + contains(QT_ARCH, x86_64){ LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGVersion CONFIG(release, debug|release) { DESTDIR = ../../../../release/win/x64/Release/ diff --git a/build.bat b/build.bat index 6e9d2b6a..43bafffe 100644 --- a/build.bat +++ b/build.bat @@ -1,13 +1,14 @@ set OEM=%1 +set ARCH=%2 if "%OEM%" == "hw" ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=HWRelease /p:Platform=x86 + MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=HWRelease /p:Platform=%ARCH% ) else ( if "%OEM%" == "lsc" ( - MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=LSCRelease /p:Platform=x86 + 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=x86 + MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) ) @@ -21,8 +22,12 @@ if "%OEM%" == "hw" ( sed -i "s/HGImgFmt/HWImgFmt/g" HGScannerTmp.pro sed -i "s/HGImgProc/HWImgProc/g" HGScannerTmp.pro sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGScannerTmp.pro - qmake -r -tp vc HGScannerTmp.pro - MSBuild.exe HanvonScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86 + 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 HanvonScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( if "%OEM%" == "lsc" ( sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGScannerTmp.pro @@ -32,11 +37,19 @@ if "%OEM%" == "hw" ( sed -i "s/HGImgFmt/LSCImgFmt/g" HGScannerTmp.pro sed -i "s/HGImgProc/LSCImgProc/g" HGScannerTmp.pro sed -i "s/logo.ico/Lanxum_logo.ico/g" HGScannerTmp.pro - qmake -r -tp vc HGScannerTmp.pro - MSBuild.exe LanxumScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86 + 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 LanxumScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( - qmake -r -tp vc HGScannerTmp.pro - MSBuild.exe HuaGoScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86 + 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% ) ) del /f /s /q *.h @@ -59,8 +72,12 @@ if "%OEM%" == "hw" ( sed -i "s/HGBase/HWBase/g" HGUpgradeTmp.pro sed -i "s/HGVersion/HWVersion/g" HGUpgradeTmp.pro sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGUpgradeTmp.pro - qmake -r -tp vc HGUpgradeTmp.pro - MSBuild.exe HWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86 + 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 HWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( if "%OEM%" == "lsc" ( sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGUpgradeTmp.pro @@ -68,11 +85,19 @@ if "%OEM%" == "hw" ( sed -i "s/HGBase/LSCBase/g" HGUpgradeTmp.pro sed -i "s/HGVersion/LSCVersion/g" HGUpgradeTmp.pro sed -i "s/logo.ico/Lanxum_logo.ico/g" HGUpgradeTmp.pro - qmake -r -tp vc HGUpgradeTmp.pro - MSBuild.exe LSCUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86 + 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 LSCUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=%ARCH% ) else ( - qmake -r -tp vc HGUpgradeTmp.pro - MSBuild.exe HGUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86 + 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% ) ) del /f /s /q *.h diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj index ece96bbb..9cf476a6 100644 --- a/build/windows/HGWebService/HGWebService.vcxproj +++ b/build/windows/HGWebService/HGWebService.vcxproj @@ -287,7 +287,7 @@ Level3 true - _DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;OEM_HUAGAO;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_HUAGAO;%(PreprocessorDefinitions) true MultiThreadedDebug ../../../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) @@ -295,7 +295,7 @@ Windows true - ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../x64/Debug/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../x64/Debug/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurld.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4098,4099,4075 /LTCG %(AdditionalOptions) @@ -305,7 +305,7 @@ true true true - NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;OEM_HUAGAO;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_HUAGAO;%(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) @@ -315,8 +315,8 @@ true true true - ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../x64/Release/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) - /LTCG %(AdditionalOptions) + ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../x64/Release/HGImgProc.lib;../../../../sdk/lib/win/x64/OEM/huagao/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) copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\ @@ -328,7 +328,7 @@ true true true - NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;OEM_HANWANG;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_HANWANG;%(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) @@ -338,8 +338,8 @@ true true true - ../x64/HWRelease/HWBase.lib;../x64/HWRelease/HWImgFmt.lib;../x64/HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x64/OEM/hanvon/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) - /LTCG %(AdditionalOptions) + ../x64/HWRelease/HWBase.lib;../x64/HWRelease/HWImgFmt.lib;../x64/HWRelease/HWImgProc.lib;../../../../sdk/lib/win/x64/OEM/hanvon/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) copy $(OutDir)HWWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\ @@ -351,7 +351,7 @@ true true true - NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;OEM_LISICHENG;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;OEM_LISICHENG;%(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) @@ -361,8 +361,8 @@ true true true - ../x64/LSCRelease/LSCBase.lib;../x64/LSCRelease/LSCImgFmt.lib;../x64/LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x64/OEM/lanxum/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies) - /LTCG %(AdditionalOptions) + ../x64/LSCRelease/LSCBase.lib;../x64/LSCRelease/LSCImgFmt.lib;../x64/LSCRelease/LSCImgProc.lib;../../../../sdk/lib/win/x64/OEM/lanxum/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) copy $(OutDir)LSCWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\