Integrated upstream changes, since I forgot to pull before making local changes.
This commit is contained in:
@@ -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>
|
||||
|
@@ -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
|
||||
|
@@ -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]
|
||||
|
@@ -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
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#ifdef __unix__
|
||||
#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
|
Reference in New Issue
Block a user