From 35c791f4e1f3456fc4a068dd1ee49ac6e5765630 Mon Sep 17 00:00:00 2001 From: havoc Date: Wed, 29 Mar 2006 10:52:14 +0000 Subject: [PATCH] merged special SUNOS LDFLAGS_UNIXCL into LDFLAGS_SUNOSCL to eliminate an ifeq which was breaking on pmake git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6208 d7cf8633-e32d-0410-b094-e92efae38249 --- makefile.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/makefile.inc b/makefile.inc index 4ee18875..bcb9764d 100644 --- a/makefile.inc +++ b/makefile.inc @@ -159,12 +159,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON) LDFLAGS_UNIXCOMMON=-lm -#LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) -ifeq ($(DP_MAKE_TARGET), sunos) - LDFLAGS_UNIXCL=-R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND) -else - LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) -endif +LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND) LDFLAGS_UNIXSDL=`sdl-config --libs` EXE_UNIXCL=darkplaces-glx @@ -214,7 +209,7 @@ OBJ_SUNOSCD=$(OBJ_NOCD) CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS # Link -LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXCL) +LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND) LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) -- 2.39.2