X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=bcb9764dd05ff0d5b0247281403086ea2738b4ad;hb=f39fed9f802790e3031eb9aa3e25d37b803116c1;hp=3996f0705555b0b54adf42218b022f301aabc536;hpb=6a75f042475ac3d601c0c85ce90f7e8cb05a11d3;p=xonotic%2Fdarkplaces.git diff --git a/makefile.inc b/makefile.inc index 3996f070..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 \ @@ -65,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 \ @@ -83,12 +83,13 @@ OBJ_COMMON= \ host.o \ host_cmd.o \ image.o \ - jpeg.o \ image_png.o \ + jpeg.o \ keys.o \ lhnet.o \ mathlib.o \ matrixlib.o \ + mdfour.o \ menu.o \ meshqueue.o \ model_alias.o \ @@ -120,11 +121,11 @@ OBJ_COMMON= \ sv_user.o \ svvm_cmds.o \ sys_shared.o \ - ui.o \ vid_shared.o \ view.o \ wad.o \ world.o \ + world_cs.o \ zone.o # note that builddate.c is very intentionally not compiled to a .o before @@ -158,17 +159,15 @@ 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 EXE_UNIXSV=darkplaces-dedicated EXE_UNIXSDL=darkplaces-sdl +EXE_UNIXCLNEXUIZ=nexuiz-glx +EXE_UNIXSVNEXUIZ=nexuiz-dedicated +EXE_UNIXSDLNEXUIZ=nexuiz-sdl CMD_UNIXRM=rm -rf @@ -199,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 ##### @@ -209,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) @@ -234,7 +234,7 @@ 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 @@ -244,6 +244,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 ##### @@ -262,15 +265,19 @@ 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 : @@ -282,6 +289,9 @@ profile : release : $(MAKE) sv-release cl-release sdl-release +nexuiz : + $(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz + cl-debug : $(MAKE) bin-debug \ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ @@ -297,6 +307,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) \ @@ -312,6 +327,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) \ @@ -327,6 +347,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) ==========" @@ -370,21 +395,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