WinSock2

rwengine · Jul 27, 2016 · f9d566e · f9d566e
1 parent d644c75
commit f9d566e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/rwgame/CMakeLists.txt b/rwgame/CMakeLists.txt
@@ -49,9 +49,10 @@ target_link_libraries( rwgame
 	${BULLET_LIBRARIES})
 if(MINGW)
 	add_definitions(-D _USE_MATH_DEFINES)
-	target_link_libraries( rwgame
+	target_link_libraries(rwgame
 	iconv
-	mman)
+	mman
+	ws2_32)
 endif()
 >>>>>>> c825ae3... Windows/MinGW_W64 compatibility
 

diff --git a/rwgame/debug/TcpSocket.cpp b/rwgame/debug/TcpSocket.cpp
@@ -1,6 +1,4 @@
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <vector>
 
@@ -65,15 +63,19 @@ size_t TcpSocket::send(const std::string& str)
 
 void TcpSocket::disconnect()
 {
-	close(sock);
+	#ifndef RW_WINDOWS
+	  close(sock);
+	#else
+	  closesocket(sock);
+	#endif
 	sock = -1;
 }
 
 
-std::string TcpSocket::getRemoteAddress() const
+char* TcpSocket::getRemoteAddress() const
 {
 	char buffer[INET_ADDRSTRLEN+1] = { };
-	return inet_ntop(AF_INET, &addr, buffer, INET_ADDRSTRLEN+1);
+	return inet_ntoa(addr.sin_addr);
 }
 
 

diff --git a/rwgame/debug/TcpSocket.hpp b/rwgame/debug/TcpSocket.hpp
@@ -1,8 +1,13 @@
 #pragma once
 
 #include <string>
+#ifndef RW_WINDOWS
 #include <netinet/in.h>
-
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#else
+#include <ws2tcpip.h>
+#endif
 
 class TcpSocket
 {
@@ -17,7 +22,7 @@ class TcpSocket
 	size_t send(const std::string& str);
 	void disconnect();
 
-	std::string getRemoteAddress() const;
+	char* getRemoteAddress() const;
 	short getRemotePort() const;
 
 private: