From fe6cfd027ef73130244c7361b906e98bf0135466 Mon Sep 17 00:00:00 2001
From: Lion Kortlepel <development@kortlepel.com>
Date: Sat, 7 Nov 2020 23:40:53 +0100
Subject: [PATCH] fix some unix stuff

---
 CMakeLists.txt          | 3 +--
 src/Console.cpp         | 8 --------
 src/Network/GParser.cpp | 4 +++-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba912f4..af49455 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 if (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -g")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s")
 elseif (WIN32)
@@ -28,7 +28,6 @@ target_include_directories(BeamMP-Server SYSTEM PUBLIC ${LUA_INCLUDE_DIR} ${Boos
 
 if (UNIX)
     find_package(Lua 5.3 REQUIRED)
-    target_include_directories(BeamMP-Server PRIVATE )
     target_link_libraries(BeamMP-Server curl z pthread stdc++fs ${Boost_LINK_DIRS} ${LUA_LIBRARIES})
 elseif (WIN32)
     include(FindLua)
diff --git a/src/Console.cpp b/src/Console.cpp
index 1fe8345..72a6248 100644
--- a/src/Console.cpp
+++ b/src/Console.cpp
@@ -63,20 +63,12 @@ static int _getch() {
     char buf = 0;
     struct termios old;
     fflush(stdout);
-    if (tcgetattr(0, &old) < 0)
-        perror("tcsetattr()");
     old.c_lflag &= ~unsigned(ICANON);
     old.c_lflag &= ~unsigned(ECHO);
     old.c_cc[VMIN] = 1;
     old.c_cc[VTIME] = 0;
-    if (tcsetattr(0, TCSANOW, &old) < 0)
-        perror("tcsetattr ICANON");
-    if (read(0, &buf, 1) < 0)
-        perror("read()");
     old.c_lflag |= ICANON;
     old.c_lflag |= ECHO;
-    if (tcsetattr(0, TCSADRAIN, &old) < 0)
-        perror("tcsetattr ~ICANON");
     // no echo printf("%c\n", buf);
     return buf;
 }
diff --git a/src/Network/GParser.cpp b/src/Network/GParser.cpp
index 45fed2d..c07c7e3 100644
--- a/src/Network/GParser.cpp
+++ b/src/Network/GParser.cpp
@@ -99,7 +99,9 @@ void VehicleParser(Client*c,const std::string& Pckt){
             SendToAll(c,Packet,false,true);
             return;
         default:
-            AssertNotReachable();
+#ifdef DEBUG
+            warn(std::string(Sec("possibly not implemented: '") + Packet + Sec("'")));
+#endif // DEBUG
             return;
     }
 }