Fixed merge issues
This commit is contained in:
parent
4f6200f057
commit
85ee140ea7
2 changed files with 19 additions and 19 deletions
|
@ -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()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue