X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=4ee18875370d54112c3b801f2cb74e32eaf666b1;hb=b8d63f8b1a4a6d8cc880be5ff8ea83aa6fbba365;hp=58135eab2240af05f1d0ffaa21faab7010b5bde7;hpb=b4d7cbeb34a1a430ab145c0b446eac4f3795f4ca;p=xonotic%2Fdarkplaces.git diff --git a/makefile.inc b/makefile.inc index 58135eab..4ee18875 100644 --- a/makefile.inc +++ b/makefile.inc @@ -5,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 @@ -33,7 +35,7 @@ LIB_SND_ALSA=-lasound # Core Audio (Mac OS X) OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c -LIB_SND_COREAUDIO= +LIB_SND_COREAUDIO=-framework CoreAudio # BSD / Sun audio API (NetBSD and OpenBSD) OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o @@ -53,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 \ @@ -63,10 +63,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 \ @@ -75,18 +77,19 @@ 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 \ mathlib.o \ matrixlib.o \ + mdfour.o \ menu.o \ meshqueue.o \ model_alias.o \ @@ -118,12 +121,11 @@ OBJ_COMMON= \ 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 @@ -135,21 +137,21 @@ 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 +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 ##### @@ -158,19 +160,25 @@ 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 EXE_UNIXSDL=darkplaces-sdl +EXE_UNIXCLNEXUIZ=nexuiz-glx +EXE_UNIXSVNEXUIZ=nexuiz-dedicated +EXE_UNIXSDLNEXUIZ=nexuiz-sdl CMD_UNIXRM=rm -rf ##### Linux specific variables ##### -DEFAULT_SNDAPI_LINUX=ALSA - # If you want CD sound in Linux OBJ_LINUXCD=cd_linux.o # If you want no CD audio @@ -184,28 +192,26 @@ LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL) ##### Mac OS X specific variables ##### -DEFAULT_SNDAPI_MACOSX=COREAUDIO - -# 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) -##### SunOS specific variables ##### +EXE_MACOSXCL=darkplaces-agl +EXE_MACOSXCLNEXUIZ=nexuiz-agl + -DEFAULT_SNDAPI_SUNOS=OSS +##### SunOS specific variables ##### # No CD support available OBJ_SUNOSCD=$(OBJ_NOCD) -CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP +CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS # Link LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXCL) @@ -215,8 +221,6 @@ LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL) ##### BSD specific variables ##### -DEFAULT_SNDAPI_BSD=BSD - #if you want CD sound in BSD OBJ_BSDCD=cd_bsd.o #if you want no CD audio @@ -230,14 +234,12 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL) ##### Win32 specific variables ##### -DEFAULT_SNDAPI_WIN32=WIN - #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_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) +OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON) # Link LDFLAGS_WINCOMMON=-lwinmm -lwsock32 @@ -247,6 +249,9 @@ LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs` EXE_WINCL=darkplaces.exe EXE_WINSV=darkplaces-dedicated.exe EXE_WINSDL=darkplaces-sdl.exe +EXE_WINCLNEXUIZ=nexuiz.exe +EXE_WINSVNEXUIZ=nexuiz-dedicated.exe +EXE_WINSDLNEXUIZ=nexuiz-sdl.exe ##### Commands ##### @@ -265,28 +270,32 @@ help: @echo "* $(MAKE) debug : make client and server binaries (debug versions)" @echo "* $(MAKE) profile : make client and server binaries (profile versions)" @echo "* $(MAKE) release : make client and server binaries (release versions)" + @echo "* $(MAKE) nexuiz : make client and server binaries with nexuiz icon (release versions)" @echo "* $(MAKE) cl-debug : make client (debug version)" @echo "* $(MAKE) cl-profile : make client (profile version)" @echo "* $(MAKE) cl-release : make client (release version)" + @echo "* $(MAKE) cl-nexuiz : make client with nexuiz icon (release version)" @echo "* $(MAKE) sv-debug : make dedicated server (debug version)" @echo "* $(MAKE) sv-profile : make dedicated server (profile version)" @echo "* $(MAKE) sv-release : make dedicated server (release version)" + @echo "* $(MAKE) sv-nexuiz : make dedicated server with nexuiz icon (release version)" @echo "* $(MAKE) sdl-debug : make SDL client (debug version)" @echo "* $(MAKE) sdl-profile : make SDL client (profile version)" @echo "* $(MAKE) sdl-release : make SDL client (release version)" + @echo "* $(MAKE) sdl-nexuiz : make SDL client with nexuiz icon (release version)" @echo debug : - $(MAKE) sdl-debug cl-debug sv-debug \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) + $(MAKE) sv-debug cl-debug sdl-debug profile : - $(MAKE) sdl-profile cl-profile sv-profile \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) + $(MAKE) sv-profile cl-profile sdl-profile release : - $(MAKE) sdl-release cl-release sv-release \ - DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) + $(MAKE) sv-release cl-release sdl-release + +nexuiz : + $(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz cl-debug : $(MAKE) bin-debug \ @@ -303,6 +312,11 @@ cl-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" +cl-nexuiz : + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)" + sv-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ @@ -318,6 +332,11 @@ sv-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)" +sv-nexuiz : + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)" + sdl-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ @@ -333,6 +352,11 @@ sdl-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" +sdl-nexuiz : + $(MAKE) bin-release \ + DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ + EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)" + bin-debug : @echo @echo "========== $(EXE) (debug) ==========" @@ -376,21 +400,36 @@ cd_sdl.o: cd_sdl.c darkplaces.o: %.o : %.rc windres -o $@ $< +nexuiz.o: %.o : %.rc + windres -o $@ $< + .c.o: $(DO_CC) -$(EXE_CL): $(OBJ_CL) +$(EXE_CL): $(OBJ_CL) $(OBJ_ICON) + $(DO_LD) + +$(EXE_SV): $(OBJ_SV) $(OBJ_ICON) + $(DO_LD) + +$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON) + $(DO_LD) + +$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ) $(DO_LD) -$(EXE_SV): $(OBJ_SV) +$(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ) $(DO_LD) -$(EXE_SDL): $(OBJ_SDL) +$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ) $(DO_LD) 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