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 #include #endif -#ifdef __unix__ +#if defined(__unix) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) #include #include #include diff --git a/includes/sock.hpp b/includes/sock.hpp index 1d2e7b7..6206b4b 100644 --- a/includes/sock.hpp +++ b/includes/sock.hpp @@ -2,7 +2,7 @@ #define _SOCK_CLASS #include -#ifdef __unix__ +#if defined(__unix__) || defined(__unix) ||(defined(__APPLE__) && defined(__MACH__)) #include #endif #ifdef _WIN32 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] diff --git a/serialization.c b/serialization.c index 09db2c4..f48d8b9 100644 --- a/serialization.c +++ b/serialization.c @@ -2,7 +2,7 @@ #include #include #include -#ifdef __unix__ +#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) #include #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 #endif #ifdef _WIN32