Merge pull request #40 from paullouisageneau/macos

MacOS support

CMakeLists.txt

@@ -64,16 +64,7 @@ target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/includ
 target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
 target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
-target_link_libraries(datachannel
-					Threads::Threads
-					Usrsctp::UsrsctpStatic
-					)
-if(WIN32)
-	target_link_libraries(datachannel
-						"wsock32"   #winsock2
-    					"ws2_32"    #winsock2
-						)
-endif()
+target_link_libraries(datachannel Threads::Threads Usrsctp::UsrsctpStatic)
 
 add_library(datachannel-static STATIC EXCLUDE_FROM_ALL ${LIBDATACHANNEL_SOURCES})
 set_target_properties(datachannel-static PROPERTIES
@@ -84,15 +75,11 @@ target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
 target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
-target_link_libraries(datachannel-static
-						Threads::Threads
-						Usrsctp::UsrsctpStatic
-						)
+target_link_libraries(datachannel-static Threads::Threads Usrsctp::UsrsctpStatic)
+
 if(WIN32)
-	target_link_libraries(datachannel-static
-						"wsock32"   #winsock2
-    					"ws2_32"    #winsock2
-						)
+	target_link_libraries(datachannel "wsock32" "ws2_32") # winsock2
+	target_link_libraries(datachannel-static "wsock32" "ws2_32") # winsock2
 endif()
 
 if (USE_GNUTLS)

deps/libjuice

@@ -1 +1 @@
-Subproject commit 856475ebd10a6b288c3e85758ae6a04caee2b3bc
+Subproject commit 455ac32ef6b892932fd0127a76899c1c92cba292

src/candidate.cpp

@@ -25,7 +25,7 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif __linux__
+#else
 #include <netdb.h>
 #include <sys/socket.h>
 #endif