deps/ox/src/ox/CMakeLists.txt

@@ -1,6 +1,3 @@
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-	set(OX_OS_WINDOWS TRUE)
-endif()
 if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 	set(OX_OS_FREEBSD TRUE)
 else()

deps/ox/src/ox/logconn/CMakeLists.txt

@@ -21,7 +21,6 @@ target_link_libraries(
 		OxStd
 		OxMetalClaw
 		$<$<BOOL:${OX_OS_FREEBSD}>:pthread>
-		$<$<BOOL:${OX_OS_WINDOWS}>:ws2_32>
 )
 
 install(

deps/ox/src/ox/logconn/logconn.cpp

@@ -9,36 +9,22 @@
 #ifdef OX_USE_STDLIB
 #include <cstdio>
 
-#include <sys/types.h>
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <unistd.h>
-#else
-#include <winsock.h>
-#undef interface
-#undef min
-#undef max
 #endif
-
+#include <sys/types.h>
-
-#include "logconn.hpp"
 
 #include <ox/std/bit.hpp>
 
+#include "logconn.hpp"
+
 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();}) {
 }
 
@@ -47,7 +33,7 @@ LoggerConn::~LoggerConn() noexcept {
 	m_waitCond.notify_one();
 	m_netThread.join();
 	if (m_socket) {
-		closeSock(m_socket);
+		close(m_socket);
 	}
 }
 

deps/ox/src/ox/logconn/logconn.hpp

@@ -17,7 +17,7 @@
 #include <ox/mc/write.hpp>
 #include <ox/std/trace.hpp>
 
-#include "circularbuff.hpp"
+#include	"circularbuff.hpp"
 
 namespace ox {
 

src/nostalgia/player/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_executable(
-	nostalgia WIN32
+	nostalgia
 		app.cpp
 		main.cpp
 )

src/nostalgia/player/main.cpp

@@ -26,11 +26,7 @@ static ox::Error run(int argc, const char **argv) noexcept {
 	return run(std::move(fs));
 }
 
-#ifdef _WIN32
-int WinMain(int argc, const char **argv) {
-#else
 int main(int argc, const char **argv) {
-#endif
 #if defined(DEBUG) && !defined(OX_BARE_METAL)
 	ox::LoggerConn loggerConn;
 	const auto loggerErr = loggerConn.initConn("Nostalgia Player");

src/nostalgia/studio/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_executable(
-	nostalgia-studio WIN32 MACOSX_BUNDLE
+	nostalgia-studio MACOSX_BUNDLE
 		main.cpp
 )
 

src/nostalgia/studio/main.cpp

@@ -7,11 +7,7 @@
 
 #include <studioapp/studioapp.hpp>
 
-#ifdef _WIN32
-int WinMain(int argc, const char **argv) {
-#else
 int main(int argc, const char **argv) {
-#endif
 	nostalgia::registerKeelModules();
 	nostalgia::registerStudioModules();
 	return studio::main("Nostalgia Studio", ".nostalgia", argc, argv);