Merge branch 'master' of github.com:novacoin-project/novacoin

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0bb860..3a59df9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,6 +180,7 @@ list(APPEND ALL_LIBRARIES ${Boost_LIBRARIES} ixwebsocket OpenSSL::Crypto qrencod
 if (WIN32)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/bitcoin-qt.rc bitcoin-qt.rc)
     list(APPEND ALL_SOURCES bitcoin-qt.rc)
+    list(APPEND ALL_LIBRARIES ws2_32 shlwapi mswsock ole32 oleaut32 uuid gdi32)
 endif()
 
 if (APPLE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4306290..d4bedc8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -96,6 +96,16 @@ set(generic_sources
 list(APPEND ALL_SOURCES ${generic_sources})
 list(APPEND ALL_LIBRARIES ${Boost_LIBRARIES} ixwebsocket OpenSSL::Crypto)
 
+# Windows-specific libraries
+if (WIN32)
+   list(APPEND ALL_LIBRARIES ws2_32 mswsock)
+endif()
+
+# Some systems need rt library
+if (NOT WIN32 AND NOT APPLE)
+    list(APPEND ALL_LIBRARIES rt)
+endif()
+
 # Try various libdb library file extensions
 if (EXISTS ${BerkeleyDB_LIBS}/libdb_cxx.a)
     list(APPEND ALL_LIBRARIES ${BerkeleyDB_LIBS}/libdb_cxx.a)