Skip to content
Snippets Groups Projects
Commit 03109a4b authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

fix for windows

parent ffab033a
No related branches found
No related tags found
No related merge requests found
:: download and untar libcurl sources to dir
:: https://curl.haxx.se/download/curl-7.58.0.tar.gz
:: set directory with libcurl sources
SET dir=c:\tmp\curl-7.58.0
:: set directory where libcurl should be installed
SET install_dir=c:\Curl
set mypath=%cd%
call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
cd /d %dir%\winbuild
nmake.exe /f Makefile.vc mode=static VC=14 MACHINE=X86 RTLIBCFG=static
xcopy /isvy %dir%\builds\libcurl-vc14-X86-release-static-ipv6-sspi-winssl\include %install_dir%\include
xcopy /isvy %dir%\builds\libcurl-vc14-X86-release-static-ipv6-sspi-winssl\lib %install_dir%\lib
rename %install_dir%\lib\libcurl_a.lib libcurl.lib
......@@ -2,6 +2,7 @@
#define HIDRA2_ERROR_H
#include <string>
#include <memory>
namespace hidra2 {
......
......@@ -16,8 +16,7 @@ Error IOErrorFromGetLastError() {
const char* message;
switch (GetLastError()) {
case ERROR_SUCCESS :
message = IOErrors::kNoError;
break;
return nullptr;
case ERROR_PATH_NOT_FOUND:
case ERROR_FILE_NOT_FOUND:
message = IOErrors::kFileNotFound;
......@@ -84,7 +83,7 @@ bool IsDirectory(const WIN32_FIND_DATA f) {
}
void ProcessFileEntity(const WIN32_FIND_DATA f, const std::string& path,
FileInfos* files, Errors* err) {
FileInfos* files, Error* err) {
*err = nullptr;
if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment