diff options
| author | bjarni <bjarni@openttd.org> | 2005-10-06 18:28:27 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-10-06 18:28:27 +0000 |
| commit | 2b44da199c7bb6aae62a7e6aaae7775a07d16bdd (patch) | |
| tree | cc2100f641ee2903f4dcf05e68f1774eeec73708 | |
| parent | 37af5bc4756bfdf4d0c2681a6f1dfca3e919b30c (diff) | |
| download | openttd-2b44da199c7bb6aae62a7e6aaae7775a07d16bdd.tar.xz | |
(svn r3023) -Fix [BeOS] fixed compilation on BeOS R5 (MYOB)
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | network_udp.c | 6 | ||||
| -rw-r--r-- | video/dedicated_v.c | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -380,12 +380,13 @@ endif ifdef BEOS CDEFS += -DBEOS -LDFLAGS += -lmidi -lbe +LDFLAGS += -lmidi -lbe -lpthread ifdef WITH_NETWORK ifdef BEOS_NET_SERVER CDEFS += -DBEOS_NET_SERVER + LDFLAGS += -lnet else - # Zeta needs a few more libraries than R5 + # BONE needs a few more libraries than R5 LDFLAGS += -lbind -lsocket endif endif diff --git a/network_udp.c b/network_udp.c index e2138a6a4..7d664f38a 100644 --- a/network_udp.c +++ b/network_udp.c @@ -350,7 +350,11 @@ bool NetworkUDPListen(SOCKET *udp, uint32 host, uint16 port, bool broadcast) // set nonblocking mode for socket { unsigned long blocking = 1; +#ifndef BEOS_NET_SERVER ioctlsocket(*udp, FIONBIO, &blocking); +#else + setsockopt(*upd, SOL_SOCKET, SO_NONBLOCK, &blocking); +#endif } sin.sin_family = AF_INET; @@ -366,7 +370,9 @@ bool NetworkUDPListen(SOCKET *udp, uint32 host, uint16 port, bool broadcast) if (broadcast) { /* Enable broadcast */ unsigned long val = 1; +#ifndef BEOS_NET_SERVER // will work around this, some day; maybe. setsockopt(*udp, SOL_SOCKET, SO_BROADCAST, (char *) &val , sizeof(val)); +#endif } DEBUG(net, 1)("[NET][UDP] Listening on port %s:%d", inet_ntoa(*(struct in_addr *)&host), port); diff --git a/video/dedicated_v.c b/video/dedicated_v.c index 2700ae4cf..3e016959d 100644 --- a/video/dedicated_v.c +++ b/video/dedicated_v.c @@ -15,6 +15,10 @@ #include "../variables.h" #include "dedicated_v.h" +#ifdef BEOS_NET_SERVER +#include <net/socket.h> +#endif + #ifdef __OS2__ # include <sys/time.h> /* gettimeofday */ # include <sys/types.h> |