From bfd38b4a89da6af042796e390df3778f3b5a7899 Mon Sep 17 00:00:00 2001
From: plagman <plagman@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 11 May 2011 21:58:19 +0000
Subject: [PATCH] Fixes for building on OpenBSD. Doesn't break Linux, pending
 Win32 synthesis results.

git-svn-id: https://svn.eduke32.com/eduke32@1879 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile                  | 6 +++++-
 polymer/eduke32/build/Makefile.shared     | 5 +++++
 polymer/eduke32/build/src/sdlayer.c       | 3 ++-
 polymer/eduke32/source/enet/src/unix.c    | 4 ----
 polymer/eduke32/source/jaudiolib/Makefile | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 58df36edf..eb0cd8daa 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -56,7 +56,11 @@ ifeq ($(PLATFORM),WINDOWS)
     EOBJ=eobj_win
     LIBS+= $(L_SSP) -Wl,--enable-auto-import
 else
-    LIBS+= -ldl -pthread
+    ifeq ($(PLATFORM),LINUX)
+        LIBS+= -ldl -pthread
+    else
+        LIBS+= -pthread
+    endif
     ifneq (0,$(PROFILER))
         LIBS+= -lprofiler
         debug+= -pg
diff --git a/polymer/eduke32/build/Makefile.shared b/polymer/eduke32/build/Makefile.shared
index f731830fc..05f47911d 100644
--- a/polymer/eduke32/build/Makefile.shared
+++ b/polymer/eduke32/build/Makefile.shared
@@ -110,6 +110,11 @@ endif
 ifeq ($(PLATFORM),BSD)
     RENDERTYPE=SDL
     BUILDCFLAGS+= -DHAVE_INTTYPES
+    ifneq ($(findstring i386, $(shell uname -m)), i386)
+        override NOASM=1
+    endif
+    override NEDMALLOC=0
+    STDCPPLIB=-lstdc++
 endif
 ifeq ($(PLATFORM),BEOS)
     RENDERTYPE=SDL
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index 2b8852e23..20ca01951 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -230,7 +230,8 @@ void setvsync(int32_t sync)
 
 static void attach_debugger_here(void) {}
 
-#ifdef __GNUC__
+/* XXX: libexecinfo could be used on systems without gnu libc. */
+#if defined __GNUC__ && !defined __OpenBSD__
 # define PRINTSTACKONSEGV 1
 # include <execinfo.h>
 #endif
diff --git a/polymer/eduke32/source/enet/src/unix.c b/polymer/eduke32/source/enet/src/unix.c
index 3b072490f..6230350bd 100644
--- a/polymer/eduke32/source/enet/src/unix.c
+++ b/polymer/eduke32/source/enet/src/unix.c
@@ -30,10 +30,6 @@
 #include <sys/poll.h>
 #endif
 
-#ifndef __socklen_t_defined
-typedef int socklen_t;
-#endif
-
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif
diff --git a/polymer/eduke32/source/jaudiolib/Makefile b/polymer/eduke32/source/jaudiolib/Makefile
index 8023dec13..159d4abff 100644
--- a/polymer/eduke32/source/jaudiolib/Makefile
+++ b/polymer/eduke32/source/jaudiolib/Makefile
@@ -16,7 +16,7 @@ endif
 CFLAGS=$(BASECFLAGS) $(F_NO_STACK_PROTECTOR)
 # for BUILD_ECHOFLAGS:
 OURCFLAGS=$(CFLAGS)
-CPPFLAGS=-I$(INC) -I$(SRC) -DHAVE_VORBIS
+CPPFLAGS=-I$(INC) -I$(SRC) `pkg-config --cflags vorbis` -DHAVE_VORBIS
 
 ifeq ($(PLATFORM),DARWIN)
     ifeq (1,$(SDL_FRAMEWORK))