cpp/openttd-patchpack/source Changeset - r2497:4f8fde59a2e8

Changeset - r2497:4f8fde59a2e8

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

bjarni - 19 years ago 2005-10-06 18:28:27
bjarni@openttd.org

(svn r3023) -Fix [BeOS] fixed compilation on BeOS R5 (MYOB)

3 files changed with 13 insertions and 2 deletions:

Makefile

network_udp.c

video/dedicated_v.c

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -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

network_udp.c

➞

Show inline comments

@@ @@ -350,7 +350,11 @@ bool NetworkUDPListen(SOCKET *udp, uint3 @@
 	// 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, uint3 @@
 	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);

video/dedicated_v.c

➞

Show inline comments

@@ @@ -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>

0 comments (0 inline, 0 general)