diff --git a/deps/ox/src/ox/CMakeLists.txt b/deps/ox/src/ox/CMakeLists.txt index 4a9985f60..815f29976 100644 --- a/deps/ox/src/ox/CMakeLists.txt +++ b/deps/ox/src/ox/CMakeLists.txt @@ -1,3 +1,6 @@ +if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + set(OX_OS_WINDOWS TRUE) +endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") set(OX_OS_FREEBSD TRUE) else() diff --git a/deps/ox/src/ox/logconn/CMakeLists.txt b/deps/ox/src/ox/logconn/CMakeLists.txt index e505fdb64..ad218cdcf 100644 --- a/deps/ox/src/ox/logconn/CMakeLists.txt +++ b/deps/ox/src/ox/logconn/CMakeLists.txt @@ -21,6 +21,7 @@ target_link_libraries( OxStd OxMetalClaw $<$:pthread> + $<$:ws2_32> ) install( diff --git a/deps/ox/src/ox/logconn/logconn.cpp b/deps/ox/src/ox/logconn/logconn.cpp index 4cfc4b633..7c64ea6f4 100644 --- a/deps/ox/src/ox/logconn/logconn.cpp +++ b/deps/ox/src/ox/logconn/logconn.cpp @@ -9,22 +9,36 @@ #ifdef OX_USE_STDLIB #include +#include #ifndef _WIN32 #include #include #include #include +#else +#include +#undef interface +#undef min +#undef max #endif -#include -#include #include "logconn.hpp" +#include + namespace ox { using namespace trace; +void closeSock(auto s) noexcept { +#ifdef _WIN32 + closesocket(s); +#else + close(s); +#endif +} + LoggerConn::LoggerConn() noexcept: m_netThread([this]{this->msgSend();}) { } @@ -33,7 +47,7 @@ LoggerConn::~LoggerConn() noexcept { m_waitCond.notify_one(); m_netThread.join(); if (m_socket) { - close(m_socket); + closeSock(m_socket); } } diff --git a/deps/ox/src/ox/logconn/logconn.hpp b/deps/ox/src/ox/logconn/logconn.hpp index a72730176..152005cc2 100644 --- a/deps/ox/src/ox/logconn/logconn.hpp +++ b/deps/ox/src/ox/logconn/logconn.hpp @@ -17,7 +17,7 @@ #include #include -#include "circularbuff.hpp" +#include "circularbuff.hpp" namespace ox {