mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
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
This commit is contained in:
parent
a0ca3ed041
commit
bfd38b4a89
5 changed files with 13 additions and 7 deletions
|
@ -56,7 +56,11 @@ ifeq ($(PLATFORM),WINDOWS)
|
||||||
EOBJ=eobj_win
|
EOBJ=eobj_win
|
||||||
LIBS+= $(L_SSP) -Wl,--enable-auto-import
|
LIBS+= $(L_SSP) -Wl,--enable-auto-import
|
||||||
else
|
else
|
||||||
|
ifeq ($(PLATFORM),LINUX)
|
||||||
LIBS+= -ldl -pthread
|
LIBS+= -ldl -pthread
|
||||||
|
else
|
||||||
|
LIBS+= -pthread
|
||||||
|
endif
|
||||||
ifneq (0,$(PROFILER))
|
ifneq (0,$(PROFILER))
|
||||||
LIBS+= -lprofiler
|
LIBS+= -lprofiler
|
||||||
debug+= -pg
|
debug+= -pg
|
||||||
|
|
|
@ -110,6 +110,11 @@ endif
|
||||||
ifeq ($(PLATFORM),BSD)
|
ifeq ($(PLATFORM),BSD)
|
||||||
RENDERTYPE=SDL
|
RENDERTYPE=SDL
|
||||||
BUILDCFLAGS+= -DHAVE_INTTYPES
|
BUILDCFLAGS+= -DHAVE_INTTYPES
|
||||||
|
ifneq ($(findstring i386, $(shell uname -m)), i386)
|
||||||
|
override NOASM=1
|
||||||
|
endif
|
||||||
|
override NEDMALLOC=0
|
||||||
|
STDCPPLIB=-lstdc++
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),BEOS)
|
ifeq ($(PLATFORM),BEOS)
|
||||||
RENDERTYPE=SDL
|
RENDERTYPE=SDL
|
||||||
|
|
|
@ -230,7 +230,8 @@ void setvsync(int32_t sync)
|
||||||
|
|
||||||
static void attach_debugger_here(void) {}
|
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
|
# define PRINTSTACKONSEGV 1
|
||||||
# include <execinfo.h>
|
# include <execinfo.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -30,10 +30,6 @@
|
||||||
#include <sys/poll.h>
|
#include <sys/poll.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __socklen_t_defined
|
|
||||||
typedef int socklen_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MSG_NOSIGNAL
|
#ifndef MSG_NOSIGNAL
|
||||||
#define MSG_NOSIGNAL 0
|
#define MSG_NOSIGNAL 0
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -16,7 +16,7 @@ endif
|
||||||
CFLAGS=$(BASECFLAGS) $(F_NO_STACK_PROTECTOR)
|
CFLAGS=$(BASECFLAGS) $(F_NO_STACK_PROTECTOR)
|
||||||
# for BUILD_ECHOFLAGS:
|
# for BUILD_ECHOFLAGS:
|
||||||
OURCFLAGS=$(CFLAGS)
|
OURCFLAGS=$(CFLAGS)
|
||||||
CPPFLAGS=-I$(INC) -I$(SRC) -DHAVE_VORBIS
|
CPPFLAGS=-I$(INC) -I$(SRC) `pkg-config --cflags vorbis` -DHAVE_VORBIS
|
||||||
|
|
||||||
ifeq ($(PLATFORM),DARWIN)
|
ifeq ($(PLATFORM),DARWIN)
|
||||||
ifeq (1,$(SDL_FRAMEWORK))
|
ifeq (1,$(SDL_FRAMEWORK))
|
||||||
|
|
Loading…
Reference in a new issue