Merge branch 'master' of https://github.com/xmrig/xmrig into xmrig-master

This commit is contained in:
enWILLYado 2018-02-17 23:36:38 +01:00
parent 4276afc4f4
commit 96be9bee18
12 changed files with 116 additions and 60 deletions

View file

@ -195,6 +195,7 @@ if (WITH_HTTPD)
message(FATAL_ERROR "microhttpd NOT found: use `-DWITH_HTTPD=OFF` to build without http deamon support")
endif()
else()
set(MHD_LIBRARY "")
add_definitions(/DXMRIG_NO_HTTPD)
add_definitions(/DXMRIG_NO_API)
endif()