Rockingcool/netpong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Integrated upstream changes, since I forgot to pull before making local changes.

Browse Source
This commit is contained in:
Aadhavan Srinivasan
2024-03-11 01:32:56 -05:00
parent 66d7585297 418579a627
commit 4001135451
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/easysock.h
View File

@@ -9,7 +9,7 @@ extern "C" {
#include <winsock.h> #include <winsock.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#ifdef __unix__ #if defined(__unix) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>

2
includes/sock.hpp
View File

@@ -2,7 +2,7 @@
#define _SOCK_CLASS #define _SOCK_CLASS
#include <string> #include <string>
#ifdef __unix__ #if defined(__unix__) || defined(__unix) ||(defined(__APPLE__) && defined(__MACH__))
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32

3
meson.build
View File

@@ -1,5 +1,6 @@
project('Pong', ['cpp', 'c'], version: '0.1') project('Pong', ['cpp', 'c'], version: '0.1')
add_global_arguments('-g', '-Wall', '-pedantic', '-Wno-unused-function', '-Wno-narrowing', language : ['cpp', 'c']) 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') compiler = meson.get_compiler('cpp')
cmake = import('cmake') cmake = import('cmake')
@@ -32,7 +33,7 @@ if build_machine.system() == 'windows'
endif 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', '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', 'serialization.c', 'timer.c', 'easysock.c',
dependencies: [raylib, ws2_dep, winmm] dependencies: [raylib, ws2_dep, winmm]

2
serialization.c
View File

@@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#ifdef __unix__ #if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32

2
server.cpp
View File

@@ -1,4 +1,4 @@
#ifdef __unix__ #if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32