X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=7354784eb730b8e07b8bb9f36414b07c9b679130;hb=715bf430b1612f5a4527968b683db80de14f10f9;hp=a512ef804e0370e98c3cd772d38d9a960325ebaa;hpb=5b40226fa72240c42e4f3b60ea562aab598cad33;p=xonotic%2Fdarkplaces.git diff --git a/makefile.inc b/makefile.inc index a512ef80..7354784e 100644 --- a/makefile.inc +++ b/makefile.inc @@ -1,5 +1,3 @@ -##### Variables that you may want to modify ##### - # Choose the compiler you want to use CC=gcc @@ -7,6 +5,8 @@ CC=gcc #CPUOPTIMIZATIONS=-march=athlon # athlon xp optimizations #CPUOPTIMIZATIONS=-march=athlon-xp +# athlon 64 optimizations +#CPUOPTIMIZATIONS=-march=athlon64 -m32 # Pentium 3 optimizations #CPUOPTIMIZATIONS=-march=pentium3 # Pentium 4 optimizations @@ -17,17 +17,41 @@ CC=gcc CPUOPTIMIZATIONS= -##### Variables that you shouldn't care about ##### +###### Sound and audio CD ##### + +OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o + +# No sound +OBJ_SND_NULL=snd_null.o +LIB_SND_NULL= + +# Open Sound System (Linux, FreeBSD and Solaris) +OBJ_SND_OSS=$(OBJ_SND_COMMON) snd_oss.o +LIB_SND_OSS= + +# Advanced Linux Sound Architecture (Linux) +OBJ_SND_ALSA=$(OBJ_SND_COMMON) snd_alsa.o +LIB_SND_ALSA=-lasound + +# Core Audio (Mac OS X) +OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c +LIB_SND_COREAUDIO=-framework CoreAudio + +# BSD / Sun audio API (NetBSD and OpenBSD) +OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o +LIB_SND_BSD= + +# DirectX and Win32 WAVE output (Win32) +OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o +LIB_SND_WIN= -# Sound objects -OBJ_COMMONSOUND=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o -OBJ_NOSOUND=snd_null.o -OBJ_OSSSOUND=$(OBJ_COMMONSOUND) snd_oss.o -LIB_OSSSOUND= # CD objects OBJ_NOCD=cd_null.o + +###### Common objects and flags ##### + # Common objects OBJ_COMMON= \ cd_shared.o \ @@ -41,10 +65,12 @@ OBJ_COMMON= \ cl_particles.o \ cl_screen.o \ cl_video.o \ + clvm_cmds.o \ cmd.o \ collision.o \ common.o \ console.o \ + csprogs.o \ curves.o \ cvar.o \ dpvsimpledecode.o \ @@ -53,13 +79,13 @@ OBJ_COMMON= \ fs.o \ gl_backend.o \ gl_draw.o \ - gl_models.o \ gl_rmain.o \ gl_rsurf.o \ gl_textures.o \ host.o \ host_cmd.o \ image.o \ + image_png.o \ jpeg.o \ keys.o \ lhnet.o \ @@ -71,15 +97,12 @@ OBJ_COMMON= \ model_brush.o \ model_shared.o \ model_sprite.o \ + mvm_cmds.o \ netconn.o \ palette.o \ polygon.o \ portals.o \ - pr_cmds.o \ - pr_edict.o \ - pr_exec.o \ protocol.o \ - mvm_cmds.o \ prvm_cmds.o \ prvm_edict.o \ prvm_exec.o \ @@ -97,39 +120,40 @@ OBJ_COMMON= \ sv_move.o \ sv_phys.o \ sv_user.o \ + svvm_cmds.o \ sys_shared.o \ ui.o \ vid_shared.o \ view.o \ wad.o \ - winding.o \ world.o \ + world_cs.o \ zone.o # note that builddate.c is very intentionally not compiled to a .o before # being linked, because it should be recompiled every time an executable is # built to give the executable a proper date string -OBJ_SV= builddate.c sys_linux.o vid_null.o $(OBJ_NOSOUND) $(OBJ_NOCD) $(OBJ_COMMON) -OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_COMMONSOUND) snd_sdl.o cd_sdl.o $(OBJ_COMMON) +OBJ_SV= builddate.c sys_linux.o vid_null.o $(OBJ_SND_NULL) $(OBJ_NOCD) $(OBJ_COMMON) +OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(OBJ_COMMON) # Compilation # CFLAGS_COMMON=-MD -Wall -Werror -CFLAGS_COMMON=-MD -Wall +CFLAGS_COMMON=-MD -Wall -Wsign-compare CFLAGS_DEBUG=-ggdb CFLAGS_PROFILE=-g -pg -ggdb CFLAGS_RELEASE= -OPTIM_DEBUG= +OPTIM_DEBUG=$(CPUOPTIMIZATIONS) OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS) DO_CC=$(CC) $(CFLAGS) -c $< -o $@ # Link -LDFLAGS_DEBUG=-g -ggdb -LDFLAGS_PROFILE=-g -pg -LDFLAGS_RELEASE= +LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) +LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE) +LDFLAGS_RELEASE=$(OPTIM_RELEASE) ##### UNIX specific variables ##### @@ -138,7 +162,12 @@ 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) -LDFLAGS_UNIXCL=$(UNIX_X11LIBPATH) -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` EXE_UNIXCL=darkplaces-glx EXE_UNIXSV=darkplaces-dedicated @@ -149,16 +178,6 @@ CMD_UNIXRM=rm -rf ##### Linux specific variables ##### -# Recommended for: anyone not using ALSA -OBJ_LINUXSOUND=$(OBJ_OSSSOUND) -LIB_LINUXSOUND=$(LIB_OSSSOUND) -# Recommended for: anyone using ALSA -#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o -#LIB_LINUXSOUND=-lasound -# Recommended for: anyone who can't use the above drivers -#OBJ_LINUXSOUND=$(OBJ_NOSOUND) -#LIB_LINUXSOUND= - # If you want CD sound in Linux OBJ_LINUXCD=cd_linux.o # If you want no CD audio @@ -172,28 +191,33 @@ LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL) ##### Mac OS X specific variables ##### -#OBJ_MACOSXSOUND=$(OBJ_COMMONSOUND) snd_coreaudio.c -OBJ_MACOSXSOUND=$(OBJ_NOSOUND) -LIB_MACOSXSOUND= - -# If you want CD sound in Mac OS X -#OBJ_MACOSXCD=cd_macosx.o -# If you want no CD audio +# No CD support available OBJ_MACOSXCD=$(OBJ_NOCD) # Link -LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL) +LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND) LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl -LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL) +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 -##### BSD specific variables ##### -OBJ_BSDSOUND=$(OBJ_COMMONSOUND) snd_bsd.o -#OBJ_BSDSOUND=$(OBJ_NOSOUND) -LIB_BSDSOUND= +##### SunOS specific variables ##### + +# No CD support available +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_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl +LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) + + +##### BSD specific variables ##### #if you want CD sound in BSD OBJ_BSDCD=cd_bsd.o @@ -208,16 +232,12 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) ##### Win32 specific variables ##### -OBJ_WINSOUND=$(OBJ_COMMONSOUND) snd_win.o -#OBJ_WINSOUND=$(OBJ_NOSOUND) -LIB_WINSOUND= - #if you want CD sound in Win32 OBJ_WINCD=cd_win.o #if you want no CD audio #OBJ_WINCD=$(OBJ_NOCD) -OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON) +OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) # Link LDFLAGS_WINCOMMON=-lwinmm -lwsock32 @@ -257,69 +277,81 @@ help: @echo debug : - $(MAKE) sdl-debug cl-debug sv-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) + $(MAKE) sv-debug cl-debug sdl-debug profile : - $(MAKE) sdl-profile cl-profile sv-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) + $(MAKE) sv-profile cl-profile sdl-profile release : - $(MAKE) sdl-release cl-release sv-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) + $(MAKE) sv-release cl-release sdl-release cl-debug : - $(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-debug \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" cl-profile : - $(MAKE) bin-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-profile \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" cl-release : - $(MAKE) bin-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" sv-debug : - $(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-debug \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" sv-profile : - $(MAKE) bin-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-profile \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" sv-release : - $(MAKE) bin-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" sdl-debug : - $(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-debug \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" sdl-profile : - $(MAKE) bin-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-profile \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" sdl-release : - $(MAKE) bin-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" bin-debug : @echo @echo "========== $(EXE) (debug) ==========" - $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ + $(MAKE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" bin-profile : @echo @echo "========== $(EXE) (profile) ==========" - $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ + $(MAKE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" bin-release : @echo @echo "========== $(EXE) (release) ==========" - $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ + $(MAKE) $(EXE) \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" strip $(EXE)