Fixup windows

CMakeLists.txt

@@ -277,7 +277,7 @@ if(UNIX)
       message(FATAL_ERROR "Your operating system is not supported yet")
   endif()
 elseif(WIN32)
-    get_filename_component(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-windows.c ABSOLUTE)
+    get_filename_component(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-windows.c ABSOLUTE)
     get_filename_component(EV_SRC "llarp/ev/ev_win32.cpp" ABSOLUTE)
     add_definitions(-DWIN32_LEAN_AND_MEAN -DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500)
 else()
@@ -336,9 +336,9 @@ else()
   endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
   if (WIN32)
-    target_link_libraries(${EXE} ${STATIC_LIB} ws2_32 iphlpapi)
+    target_link_libraries(${EXE} PUBLIC ${STATIC_LIB} ws2_32 iphlpapi)
   else()
-    target_link_libraries(${EXE} ${STATIC_LIB} cppbackport libutp)
+    target_link_libraries(${EXE} PUBLIC ${STATIC_LIB} cppbackport libutp)
   endif(WIN32)
 
 

llarp/CMakeLists.txt

@@ -31,11 +31,10 @@ set(LIB_UTIL_SRC
 
 add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
 target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${UTIL_LIB} PUBLIC cppbackport absl::variant)
 
 # cut back on fluff
 if (NOT WIN32)
-    target_link_libraries(${UTIL_LIB} PUBLIC absl::optional)
+    target_link_libraries(${UTIL_LIB} PUBLIC absl::optional absl::variant cppbackport)
 endif(NOT WIN32)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -58,7 +57,7 @@ set(LIB_PLATFORM_SRC
 )
 
 add_library(${PLATFORM_LIB} STATIC ${LIB_PLATFORM_SRC})
-target_link_libraries(${PLATFORM_LIB} PUBLIC ${CRYPTOGRAPHY_LIB} ${UTIL_LIB} libutp cppbackport Threads::Threads)
+target_link_libraries(${PLATFORM_LIB} PUBLIC ${CRYPTOGRAPHY_LIB} ${UTIL_LIB} libutp Threads::Threads)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if(NON_PC_TARGET)
@@ -72,7 +71,11 @@ endif()
 
 if(WIN32)
   # win32 inline code
-  target_sources(${PLATFORM_LIB} PUBLIC win32/win32_inet.c win32/win32_intrnl.c win32/win32_upoll.c)
+  get_filename_component(win32_inet win32/win32_inet.c ABSOLUTE)
+  get_filename_component(win32_intrnl win32/win32_intrnl.c ABSOLUTE)
+  get_filename_component(win32_upoll win32/win32_upoll.c ABSOLUTE)
+  target_sources(${PLATFORM_LIB} PUBLIC ${win32_inet} ${win32_intrnl} ${win32_upoll})
+  target_link_libraries(${PLATFORM_LIB} PUBLIC iphlpapi)
 endif()
 
 if(USE_LIBABYSS)
@@ -202,7 +205,7 @@ set(LIB_SRC
 )
 
 add_library(${STATIC_LIB} STATIC ${LIB_SRC})
-target_link_libraries(${STATIC_LIB} PUBLIC ${PLATFORM_LIB} ${UTIL_LIB} ${CRYPTOGRAPHY_LIB} cppbackport libutp ${LIBS})
+target_link_libraries(${STATIC_LIB} PUBLIC ${PLATFORM_LIB} ${UTIL_LIB} ${CRYPTOGRAPHY_LIB} libutp ${LIBS})
 
 if(TESTNET)
   target_sources(${STATIC_LIB} PUBLIC testnet.c)

llarp/ev/ev.cpp

@@ -44,8 +44,7 @@ llarp_make_ev_loop()
     || (__APPLE__ && __MACH__)
   std::unique_ptr< llarp_ev_loop > r = std::make_unique< llarp_kqueue_loop >();
 #elif defined(_WIN32) || defined(_WIN64) || defined(__NT__)
-  std::unique_ptr< llarp_win32_loop > r =
-      std::make_unique< llarp_kqueue_loop >();
+  std::unique_ptr< llarp_ev_loop > r = std::make_unique< llarp_win32_loop >();
 #else
 // TODO: fall back to a generic select-based event loop
 #error no event loop subclass

test/win32/test.rc

@@ -6,7 +6,7 @@
 //
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include <win32/resource.h>
 #include <winresrc.h>
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources