Merge pull request #5936

24473d7 build: fix MinGW GUI dependencies build (xiphon)
This commit is contained in:
luigi1111 2019-10-08 14:46:09 -05:00
commit da7a3dd17b
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -29,7 +29,7 @@
add_library(epee STATIC byte_slice.cpp hex.cpp http_auth.cpp mlog.cpp net_helper.cpp net_utils_base.cpp string_tools.cpp wipeable_string.cpp add_library(epee STATIC byte_slice.cpp hex.cpp http_auth.cpp mlog.cpp net_helper.cpp net_utils_base.cpp string_tools.cpp wipeable_string.cpp
levin_base.cpp memwipe.c connection_basic.cpp network_throttle.cpp network_throttle-detail.cpp mlocker.cpp buffer.cpp net_ssl.cpp) levin_base.cpp memwipe.c connection_basic.cpp network_throttle.cpp network_throttle-detail.cpp mlocker.cpp buffer.cpp net_ssl.cpp)
if (USE_READLINE AND (GNU_READLINE_FOUND OR DEPENDS AND NOT MINGW)) if (USE_READLINE AND (GNU_READLINE_FOUND OR (DEPENDS AND NOT MINGW)))
add_library(epee_readline STATIC readline_buffer.cpp) add_library(epee_readline STATIC readline_buffer.cpp)
endif() endif()
@ -62,7 +62,7 @@ target_link_libraries(epee
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
if (USE_READLINE AND (GNU_READLINE_FOUND OR DEPENDS AND NOT MINGW)) if (USE_READLINE AND (GNU_READLINE_FOUND OR (DEPENDS AND NOT MINGW)))
target_link_libraries(epee_readline target_link_libraries(epee_readline
PUBLIC PUBLIC
easylogging easylogging