diff --git a/device/lib/x64/Debug/libcrypto.lib b/device/lib/x64/Debug/libcrypto.lib new file mode 100644 index 0000000..d68b56f Binary files /dev/null and b/device/lib/x64/Debug/libcrypto.lib differ diff --git a/device/lib/x64/Debug/libssl.lib b/device/lib/x64/Debug/libssl.lib new file mode 100644 index 0000000..f99235e Binary files /dev/null and b/device/lib/x64/Debug/libssl.lib differ diff --git a/device/lib/x64/Release/libcrypto.lib b/device/lib/x64/Release/libcrypto.lib new file mode 100644 index 0000000..d68b56f Binary files /dev/null and b/device/lib/x64/Release/libcrypto.lib differ diff --git a/device/lib/x64/Release/libssl.lib b/device/lib/x64/Release/libssl.lib new file mode 100644 index 0000000..f99235e Binary files /dev/null and b/device/lib/x64/Release/libssl.lib differ diff --git a/device/lib/x86/Debug/libcrypto.lib b/device/lib/x86/Debug/libcrypto.lib new file mode 100644 index 0000000..d68b56f Binary files /dev/null and b/device/lib/x86/Debug/libcrypto.lib differ diff --git a/device/lib/x86/Debug/libssl.lib b/device/lib/x86/Debug/libssl.lib new file mode 100644 index 0000000..f99235e Binary files /dev/null and b/device/lib/x86/Debug/libssl.lib differ diff --git a/device/lib/x86/Release/libcrypto.lib b/device/lib/x86/Release/libcrypto.lib new file mode 100644 index 0000000..d68b56f Binary files /dev/null and b/device/lib/x86/Release/libcrypto.lib differ diff --git a/device/lib/x86/Release/libssl.lib b/device/lib/x86/Release/libssl.lib new file mode 100644 index 0000000..f99235e Binary files /dev/null and b/device/lib/x86/Release/libssl.lib differ diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj index 4efab7d..27c606d 100644 --- a/device/scanner.vcxproj +++ b/device/scanner.vcxproj @@ -173,7 +173,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" Console true msvcprtd.lib; - opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;zlib.lib;user32.lib + opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;zlib.lib;user32.lib;libcrypto.lib;libssl.lib $(ProjectDir)device.def diff --git a/device/scanner.vcxproj.user b/device/scanner.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/device/scanner.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/sln/hgscanner.sln b/sln/hgscanner.sln index dc15f3b..f328b43 100644 --- a/sln/hgscanner.sln +++ b/sln/hgscanner.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.32106.194 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sane", "..\sane\sane.vcxproj", "{6EEC8A02-7F98-4422-8ED6-2434D43BD1E1}" EndProject @@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup", "setup", "{F6774650 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgsetver", "hgsetver\hgsetver.vcxproj", "{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdemo", "testdemo\testdemo.vcxproj", "{6817035F-A550-4ED5-8338-8616F2FB1CA8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -53,6 +55,14 @@ Global {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.Build.0 = Release|x64 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x86.ActiveCfg = Release|Win32 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x86.Build.0 = Release|Win32 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Debug|x64.ActiveCfg = Debug|x64 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Debug|x64.Build.0 = Debug|x64 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Debug|x86.ActiveCfg = Debug|Win32 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Debug|x86.Build.0 = Debug|Win32 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Release|x64.ActiveCfg = Release|x64 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Release|x64.Build.0 = Release|x64 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Release|x86.ActiveCfg = Release|Win32 + {6817035F-A550-4ED5-8338-8616F2FB1CA8}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE