Merge branch 'develop' of https://github.com/lotrf3/cpp-ethereum into develop

alethzero/CMakeLists.txt

@@ -42,6 +42,9 @@ eth_add_executable(${EXECUTABLE}
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
+if(WIN32)
+	target_link_libraries(${EXECUTABLE} Iphlpapi)
+endif()
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} Qt5::Widgets)
 target_link_libraries(${EXECUTABLE} Qt5::WebEngine)

eth/CMakeLists.txt

@@ -19,6 +19,9 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
+if(WIN32)
+	target_link_libraries(${EXECUTABLE} Iphlpapi)
+endif()
 target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES})
 
 if (READLINE_FOUND)

extdep/getstuff.bat

@@ -13,6 +13,7 @@ call :download json-rpc-cpp 0.5.0
 call :download leveldb 1.2
 call :download microhttpd 0.9.2
 call :download qt 5.4.1
+call :download miniupnpc 1.9
 
 goto :EOF
 

test/CMakeLists.txt

@@ -69,6 +69,9 @@ endforeach(file)
 file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})
 
+if(WIN32)
+	target_link_libraries(testeth Iphlpapi)
+endif()
 target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
 target_link_libraries(testeth ${CURL_LIBRARIES})
 target_link_libraries(testeth ethereum)