From 2c439d4875103b25f47721b35fd16dbdd3d70807 Mon Sep 17 00:00:00 2001 From: molivier Date: Mon, 13 Dec 2004 15:41:32 +0000 Subject: [PATCH] Fixed BSD makefile for NetBSD git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4838 d7cf8633-e32d-0410-b094-e92efae38249 --- makefile.bsd | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/makefile.bsd b/makefile.bsd index a120a69f..81c080df 100644 --- a/makefile.bsd +++ b/makefile.bsd @@ -5,24 +5,23 @@ DP_MAKE_TARGET=bsd .endif +DP_ARCH != uname # Command used to delete files CMD_RM=$(CMD_UNIXRM) -# FIXME: should support lib64 based on uname -m output -UNIX_X11LIBPATH=-L/usr/X11R6/lib - # BSD configuration .if $(DP_MAKE_TARGET) == "bsd" # FreeBSD uses OSS -.if exists(/usr/include/sys/soundcard.h) +.if $(DP_ARCH) == "FreeBSD" OBJ_SOUND=$(OBJ_OSSSOUND) +LIB_SOUND=$(LIB_OSSSOUND) .else OBJ_SOUND=$(OBJ_BSDSOUND) -.endif LIB_SOUND=$(LIB_BSDSOUND) +.endif OBJ_CD=$(OBJ_BSDCD) OBJ_CL=$(OBJ_GLX) -- 2.39.2