From aab330123438590b3665eb69be924a3618b00e18 Mon Sep 17 00:00:00 2001
From: Marc-Eric Martel <memartel@turcotinga.ca>
Date: Sat, 28 Oct 2023 14:11:01 -0400
Subject: [PATCH] Client Linux qui re-marche

---
 SQCSim-common/define.h          | 4 ++++
 SQCSim2021/cmake/CMakeLists.txt | 3 ++-
 SQCSim2021/connector.cpp        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/SQCSim-common/define.h b/SQCSim-common/define.h
index 0d71942..9cb966e 100644
--- a/SQCSim-common/define.h
+++ b/SQCSim-common/define.h
@@ -46,6 +46,8 @@ typedef uint64_t Timestamp;
 #include <cstdio>
 #include <ctime>
 
+#define ioctl ioctlsocket
+#define O_NONBLOCK FIONBIO
 #define strcpy strcpy_s
 #define addrlen_t int
 #define popen _popen
@@ -57,10 +59,12 @@ typedef uint64_t Timestamp;
 #include <time.h>
 #include <stdio.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <cstring>
 
+
 #define addrlen_t unsigned int
 #define SOCKET int
 #define INVALID_SOCKET -1
diff --git a/SQCSim2021/cmake/CMakeLists.txt b/SQCSim2021/cmake/CMakeLists.txt
index f1aad75..4da3eb4 100644
--- a/SQCSim2021/cmake/CMakeLists.txt
+++ b/SQCSim2021/cmake/CMakeLists.txt
@@ -50,7 +50,8 @@ add_executable(SQCSim-client
 			"../textureatlas.cpp"
 			"../tool.cpp"
 			"../vertexbuffer.cpp"
-			"../worldrenderer.cpp"
+			"../renderer.cpp"
+			"../remoteplayer.cpp"
 			"../main.cpp"
 			)
 
diff --git a/SQCSim2021/connector.cpp b/SQCSim2021/connector.cpp
index dd83166..d4119a7 100644
--- a/SQCSim2021/connector.cpp
+++ b/SQCSim2021/connector.cpp
@@ -57,7 +57,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 		return 2;
 	}
 
-	if (ioctlsocket(m_sock_tcp, FIONBIO, nullptr) < 0) {
+	if (ioctl(m_sock_tcp, SOCK_NONBLOCK, nullptr) < 0) {
 		std::cout << "Impossible de mettre le socket en mode non-bloquant." << std::endl;
 		return 3;
 	}