Fixed merge issues

This commit is contained in:
BenDroid 2018-03-02 21:54:23 +01:00
parent f171801a61
commit ac805bd56f
2 changed files with 19 additions and 19 deletions

View file

@ -144,7 +144,6 @@ 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()