From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 16 Jun 2020 12:39:51 +0000 (+0000)
Subject: Clean up makefiles a bit. Remove leftovers of stuff no longer in the engine
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=867a971e1ca191d702e1ac88c0a2118f452b1c9f;p=xonotic%2Fdarkplaces.git

Clean up makefiles a bit. Remove leftovers of stuff no longer in the engine

Slightly clean up the makefiles. 3DRAS and D3D don't exist in the engine
anymore.

Fix from nico: https://gitlab.com/xonotic/darkplaces/-/merge_requests/91

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12681 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/BSDmakefile b/BSDmakefile
index b6cebea7..0c5e55cc 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -33,10 +33,10 @@ DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 DP_VIDEO_CAPTURE?=enabled
 .if $(DP_VIDEO_CAPTURE) == "enabled"
   CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE
-  OBJ_VIDEO_CAPTURE = cap_avi.o cap_ogg.o
+  OBJ_VIDEO_CAPTURE=cap_avi.o cap_ogg.o
 .else
   CFLAGS_VIDEO_CAPTURE=
-  OBJ_VIDEO_CAPTURE =
+  OBJ_VIDEO_CAPTURE=
 .endif
 
 # X11 libs
diff --git a/makefile b/makefile
index 17c67769..685fb63d 100644
--- a/makefile
+++ b/makefile
@@ -78,7 +78,7 @@ TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz
 DP_VIDEO_CAPTURE?=enabled
 ifeq ($(DP_VIDEO_CAPTURE), enabled)
 	CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE
-	OBJ_VIDEO_CAPTURE= cap_avi.o cap_ogg.o
+	OBJ_VIDEO_CAPTURE=cap_avi.o cap_ogg.o
 else
 	CFLAGS_VIDEO_CAPTURE=
 	OBJ_VIDEO_CAPTURE=
@@ -213,9 +213,7 @@ ifeq ($(WIN64RELEASE), 1)
 #	WINDRES=$(TARGET)-windres
 endif
 
-CFLAGS_D3D=
 CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
-LDFLAGS_D3D=
 
 
 ifeq ($(DP_MAKE_TARGET), mingw)
diff --git a/makefile.inc b/makefile.inc
index 6d9826fb..3c4982cc 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -71,10 +71,6 @@ LIB_SND_BSD=
 OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o
 LIB_SND_WIN=
 
-# Qantourisc's 3D Realtime Acoustic Lib (3D RAS)
-OBJ_SND_3DRAS=snd_3dras.o
-LIB_SND_3DRAS=
-
 
 ###### Common objects and flags #####
 
@@ -171,7 +167,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
 
 
 # Compilation
-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
 CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE)
 CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb