X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=eca83c29920c78734a4d5cb7c5e30e6fc125a225;hb=c8a752c0764c484a3a135b3239c37ed6713286cf;hp=427f937907f41f3fd043286d5da9ff9b5bca26eb;hpb=9e279d8ea4a631713d98132cd1b01338e81f5c0b;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index 427f9379..eca83c29 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -16,6 +16,8 @@ CC=gcc
 # No specific CPU (386 compatible)
 CPUOPTIMIZATIONS=
 
+SDL_CONFIG?=sdl-config
+
 
 ###### Sound and audio CD #####
 
@@ -55,8 +57,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 \
@@ -89,6 +89,7 @@ OBJ_COMMON= \
 	jpeg.o \
 	keys.o \
 	lhnet.o \
+	libcurl.o \
 	mathlib.o \
 	matrixlib.o \
 	mdfour.o \
@@ -107,7 +108,6 @@ OBJ_COMMON= \
 	prvm_cmds.o \
 	prvm_edict.o \
 	prvm_exec.o \
-	r_crosshairs.o \
 	r_explosion.o \
 	r_lerpanim.o \
 	r_light.o \
@@ -123,7 +123,6 @@ OBJ_COMMON= \
 	sv_user.o \
 	svvm_cmds.o \
 	sys_shared.o \
-	ui.o \
 	vid_shared.o \
 	view.o \
 	wad.o \
@@ -139,11 +138,11 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(
 
 
 # Compilation
-# CFLAGS_COMMON=-MD -Wall -Werror
-CFLAGS_COMMON=-MD -Wall -Wsign-compare
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_FS) -Wall -Wsign-compare
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
+CFLAGS_SDL=`$(SDL_CONFIG) --cflags`
 
 OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
 OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
@@ -162,14 +161,9 @@ 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_UNIXSDL=`sdl-config --libs`
+LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+
+LDFLAGS_UNIXSDL=`$(SDL_CONFIG) --libs`
 EXE_UNIXCL=darkplaces-glx
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
@@ -201,7 +195,7 @@ OBJ_MACOSXCD=$(OBJ_NOCD)
 # Link
 LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND)
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
-LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs`
+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)
 
@@ -217,7 +211,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)
 
@@ -248,7 +242,7 @@ OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $
 LDFLAGS_WINCOMMON=-lwinmm -lwsock32
 LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
 LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
-LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs`
+LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `$(SDL_CONFIG) --libs`
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
@@ -389,16 +383,16 @@ vid_glx.o: vid_glx.c
 	$(DO_CC) -I/usr/X11R6/include
 
 vid_sdl.o: vid_sdl.c
-	$(DO_CC) `sdl-config --cflags`
+	$(DO_CC) $(CFLAGS_SDL)
 
 sys_sdl.o: sys_sdl.c
-	$(DO_CC) `sdl-config --cflags`
+	$(DO_CC) $(CFLAGS_SDL)
 
 snd_sdl.o: snd_sdl.c
-	$(DO_CC) `sdl-config --cflags`
+	$(DO_CC) $(CFLAGS_SDL)
 
 cd_sdl.o: cd_sdl.c
-	$(DO_CC) `sdl-config --cflags`
+	$(DO_CC) $(CFLAGS_SDL)
 
 darkplaces.o: %.o : %.rc
 	windres -o $@ $<