Merge pull request #310 from despair86/dev

win32 libabyss patch

CMakeLists.txt

@@ -89,6 +89,7 @@ if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
     add_compile_options(-Wno-unused-command-line-argument -Wno-c++11-narrowing)
     add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-bad-function-cast>)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--allow-multiple-definition")
     if (NO_LIBGCC)
       set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc_eh ${CMAKE_CXX_STANDARD_LIBRARIES}")
       set(CMAKE_C_STANDARD_LIBRARIES "-lgcc_eh ${CMAKE_C_STANDARD_LIBRARIES}")
@@ -364,12 +365,12 @@ if(USE_LIBABYSS)
 
   if (NOT WIN32)
     add_executable(${ABYSS_EXE} ${ABYSS}/main.cpp)
+    target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} Threads::Threads)
   else()
     add_executable(${ABYSS_EXE} ${ABYSS}/main.cpp llarp/win32/abyss.rc)
-    target_link_libraries(${ABYSS_EXE} ws2_32 iphlpapi)
+    target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} ws2_32)
   endif(NOT WIN32)
 
-  target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} Threads::Threads)
   target_include_directories(${UTIL_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
   target_include_directories(${ABYSS_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")
   target_include_directories(${ABYSS_EXE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include")

libutp/CMakeLists.txt

@@ -12,4 +12,7 @@ if(WIN32)
 endif(WIN32)
 
 add_library(libutp STATIC ${UTP_SRC})
-target_include_directories(libutp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CORE_INCLUDE})
+if(WIN32)
+  target_link_libraries(libutp ws2_32)
+endif(WIN32)
+target_include_directories(libutp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CORE_INCLUDE})