From: divverent Date: Tue, 18 Mar 2008 13:06:34 +0000 (+0000) Subject: It seems that 2.4 BSDmakefile is missing some SDL defines, and thus is X-Git-Tag: xonotic-v0.1.0preview~2313 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b9b5df66c5f2fce9ce8de22c6b77d3054f4f742;p=xonotic%2Fdarkplaces.git It seems that 2.4 BSDmakefile is missing some SDL defines, and thus is broken (tested under FreeBSD). Also, last lines about dependencies are probably gmake-leftovers and are not needed on BSD (in fact, they've been causing errors since some older version). Please consider attached patch. Thanks. -- danfe (FreeBSD port maintainer) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8213 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/BSDmakefile b/BSDmakefile index 6514487e..23563cd3 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -31,6 +31,10 @@ LDFLAGS_CL=$(LDFLAGS_BSDCL) LDFLAGS_SV=$(LDFLAGS_BSDSV) LDFLAGS_SDL=$(LDFLAGS_BSDSDL) +SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) +SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) +SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + EXE_CL=$(EXE_UNIXCL) EXE_SV=$(EXE_UNIXSV) EXE_SDL=$(EXE_UNIXSDL) @@ -93,11 +97,3 @@ DO_LD=$(CC) -o $@ $> $(LDFLAGS) ##### Definitions shared by all makefiles ##### .include "makefile.inc" - - -##### Dependency files ##### - -DEPEND_FILES != ls *.d -.for i in $(DEPEND_FILES) -. include "$i" -.endfor