From 6acbf90d8073f7285334d977f53bb63c9482acec Mon Sep 17 00:00:00 2001
From: Aadhavan Srinivasan <aadhavan@twomorecents.org>
Date: Sun, 10 Mar 2024 00:50:53 -0600
Subject: [PATCH 1/2] Updated UNIX macro checks, to account for MacOS

---
 includes/easysock.h | 2 +-
 includes/sock.hpp   | 2 +-
 serialization.c     | 2 +-
 server.cpp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/easysock.h b/includes/easysock.h
index 0348838..0a68452 100644
--- a/includes/easysock.h
+++ b/includes/easysock.h
@@ -9,7 +9,7 @@ extern "C" {
 	#include <winsock.h>
 	#include <ws2tcpip.h>
 #endif
-#ifdef __unix__
+#if defined(__unix) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 	#include <sys/types.h>
 	#include <sys/socket.h>
 	#include <netdb.h>
diff --git a/includes/sock.hpp b/includes/sock.hpp
index b73eca3..05b28ff 100644
--- a/includes/sock.hpp
+++ b/includes/sock.hpp
@@ -2,7 +2,7 @@
 #define _SOCK_CLASS
 
 #include <string>
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) ||(defined(__APPLE__) && defined(__MACH__))
 	#include <sys/socket.h>
 #endif
 #ifdef _WIN32
diff --git a/serialization.c b/serialization.c
index 09db2c4..f48d8b9 100644
--- a/serialization.c
+++ b/serialization.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 	#include <arpa/inet.h>
 #endif
 #ifdef _WIN32
diff --git a/server.cpp b/server.cpp
index 34decd1..5785878 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1,4 +1,4 @@
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 	#include <sys/socket.h>
 #endif
 #ifdef _WIN32

From 418579a627629daa328beccf52ad2ec067ff1483 Mon Sep 17 00:00:00 2001
From: Aadhavan Srinivasan <aadhavan@twomorecents.org>
Date: Sun, 10 Mar 2024 01:09:31 -0600
Subject: [PATCH 2/2] Added C++ standard as a compiler flag, which is
 apparently needed by compilers on macOS

---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index c1cbcd4..125b9ec 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,6 @@
 project('Pong', ['cpp', 'c'], version: '0.1')
 add_global_arguments('-g', '-Wall', '-pedantic', '-Wno-unused-function', '-Wno-narrowing', language : ['cpp', 'c'])
+add_global_arguments('-std=c++11', language: ['cpp'])
 compiler = meson.get_compiler('cpp')
 cmake = import('cmake')
 
@@ -32,7 +33,7 @@ if build_machine.system() == 'windows'
 
 endif
 
-executable('pong', 
+executable('pong',
 	'main.cpp', 'sock.cpp','paddle.cpp', 'ball.cpp', 'numeric_base.cpp', 'connect_code.cpp', 'server.cpp', 'client.cpp', 'check_input.cpp', 'raygui_helpers.cpp',
 	'serialization.c', 'timer.c', 'easysock.c',
 	dependencies: [raylib, ws2_dep, winmm]