X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=bcb9764dd05ff0d5b0247281403086ea2738b4ad;hb=e19ae5af1136a913d72fd12b8cf136faf362c0d9;hp=d97df1452ddfd3286c7dda655fd7880108759785;hpb=582c8871d441ba4659a646462143d917712d5c4b;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index d97df145..bcb9764d 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -55,8 +55,6 @@ OBJ_NOCD=cd_null.o
 # Common objects
 OBJ_COMMON= \
 	cd_shared.o \
-	cgame.o \
-	cgamevm.o \
 	cl_collision.o \
 	cl_demo.o \
 	cl_input.o \
@@ -91,6 +89,7 @@ OBJ_COMMON= \
 	lhnet.o \
 	mathlib.o \
 	matrixlib.o \
+	mdfour.o \
 	menu.o \
 	meshqueue.o \
 	model_alias.o \
@@ -122,7 +121,6 @@ OBJ_COMMON= \
 	sv_user.o \
 	svvm_cmds.o \
 	sys_shared.o \
-	ui.o \
 	vid_shared.o \
 	view.o \
 	wad.o \
@@ -161,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
@@ -205,6 +198,7 @@ LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs`
 OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
 
 EXE_MACOSXCL=darkplaces-agl
+EXE_MACOSXCLNEXUIZ=nexuiz-agl
 
 
 ##### SunOS specific variables #####
@@ -215,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)
 
@@ -429,5 +423,8 @@ clean:
 	-$(CMD_RM) $(EXE_CL)
 	-$(CMD_RM) $(EXE_SV)
 	-$(CMD_RM) $(EXE_SDL)
+	-$(CMD_RM) $(EXE_CLNEXUIZ)
+	-$(CMD_RM) $(EXE_SVNEXUIZ)
+	-$(CMD_RM) $(EXE_SDLNEXUIZ)
 	-$(CMD_RM) *.o
 	-$(CMD_RM) *.d