X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.mingwcross;h=7d0f5d38fa3223249cf1964bd67ed34a85ef2743;hp=1914415ede681514a1474ddfe145c668f43ef9e4;hb=ebd79ac26160a878c6f0d4a9736361e0b7f549d4;hpb=b89606df66f908e527f94a14efaa6499d423083b diff --git a/makefile.mingwcross b/makefile.mingwcross index 1914415e..7d0f5d38 100644 --- a/makefile.mingwcross +++ b/makefile.mingwcross @@ -28,7 +28,7 @@ CLIENTOBJECTS= cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \ console.o dpvsimpledecode.o fractalnoise.o gl_backend.o \ gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o \ jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \ - r_explosion.o r_lerpanim.o r_light.o r_modules.o r_sky.o \ + r_lerpanim.o r_light.o r_modules.o r_sky.o \ r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \ r_shadow.o conproc.o SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \ @@ -36,14 +36,15 @@ SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \ SHAREDOBJECTS= builddate.o cmd.o collision.o common.o crc.o cvar.o \ filematch.o host.o host_cmd.o image.o mathlib.o matrixlib.o \ model_alias.o model_brush.o model_shared.o model_sprite.o \ - net_dgrm.o net_loop.o net_main.o net_master.o \ - palette.o portals.o protocol.o quakeio.o \ + net_bsd.o net_dgrm.o net_loop.o net_main.o net_master.o \ + net_udp.o palette.o portals.o protocol.o fs.o \ sys_shared.o world.o wad.o zone.o +COMMONOBJECTS= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS) - -OBJ_COMMON= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS) -OBJ_WGL= vid_wgl.o $(OBJ_CD) $(OBJ_SND) net_win.o net_wins.o net_wipx.o sys_win.o -OBJ_DED= vid_null.o cd_null.o snd_null.o net_win.o net_wins.o net_wipx.o sys_win.o +# objects used by wgl target +OBJ_WGL= sys_win.o vid_wgl.o $(OBJ_CD) $(OBJ_SND) $(COMMONOBJECTS) +# objects used by dedicated target +OBJ_DED= sys_linux.o vid_null.o cd_null.o snd_null.o $(COMMONOBJECTS) # Compilation @@ -62,7 +63,8 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@ # Link -LDFLAGS_COMMON=--mwindows -luser32 -lgdi32 -lwinmm -ldxguid -ldinput -lopengl32 -lcomctl32 -lwsock32 +LDFLAGS_WGL=-mwindows -luser32 -lgdi32 -lwinmm -ldxguid -ldinput -lcomctl32 -lwsock32 +LDFLAGS_DED=-mwindows -lwinmm -lwsock32 LDFLAGS_DEBUG=-g -ggdb LDFLAGS_PROFILE=-g -pg LDFLAGS_RELEASE= @@ -85,17 +87,17 @@ DO_LD=$(CC) -o $@ $^ $(LDFLAGS) help: @echo @echo "===== Choose one =====" - @echo "* clean : delete the binaries, and .o and .d files" - @echo "* help : this help" - @echo "* debug : make WGL and dedicated binaries (debug versions)" - @echo "* profile : make WGL and dedicated binaries (profile versions)" - @echo "* release : make WGL and dedicated binaries (release versions)" - @echo "* wgl-debug : make WGL binary (debug version)" - @echo "* wgl-profile : make WGL binary (profile version)" - @echo "* wgl-release : make WGL binary (release version)" - @echo "* ded-debug : make dedicated server (debug version)" - @echo "* ded-profile : make dedicated server (profile version)" - @echo "* ded-release : make dedicated server (release version)" + @echo "* $(MAKE) clean : delete the binaries, and .o and .d files" + @echo "* $(MAKE) help : this help" + @echo "* $(MAKE) debug : make WGL and dedicated binaries (debug versions)" + @echo "* $(MAKE) profile : make WGL and dedicated binaries (profile versions)" + @echo "* $(MAKE) release : make WGL and dedicated binaries (release versions)" + @echo "* $(MAKE) wgl-debug : make WGL binary (debug version)" + @echo "* $(MAKE) wgl-profile : make WGL binary (profile version)" + @echo "* $(MAKE) wgl-release : make WGL binary (release version)" + @echo "* $(MAKE) ded-debug : make dedicated server (debug version)" + @echo "* $(MAKE) ded-profile : make dedicated server (profile version)" + @echo "* $(MAKE) ded-release : make dedicated server (release version)" @echo debug : @@ -108,70 +110,58 @@ release : $(MAKE) -f makefile.mingwcross wgl-release ded-release wgl-debug : - $(MAKE) -f makefile.mingwcross bin-debug EXE="$(EXE_WGL)" + $(MAKE) -f makefile.mingwcross bin-debug EXE="$(EXE_WGL)" LDFLAGS_COMMON="$(LDFLAGS_WGL)" wgl-profile : - $(MAKE) -f makefile.mingwcross bin-profile EXE="$(EXE_WGL)" + $(MAKE) -f makefile.mingwcross bin-profile EXE="$(EXE_WGL)" LDFLAGS_COMMON="$(LDFLAGS_WGL)" wgl-release : - $(MAKE) -f makefile.mingwcross bin-release EXE="$(EXE_WGL)" + $(MAKE) -f makefile.mingwcross bin-release EXE="$(EXE_WGL)" LDFLAGS_COMMON="$(LDFLAGS_WGL)" ded-debug : - $(MAKE) -f makefile.mingwcross bin-debug EXE="$(EXE_DED)" + $(MAKE) -f makefile.mingwcross bin-debug EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" ded-profile : - $(MAKE) -f makefile.mingwcross bin-profile EXE="$(EXE_DED)" + $(MAKE) -f makefile.mingwcross bin-profile EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" ded-release : - $(MAKE) -f makefile.mingwcross bin-release EXE="$(EXE_DED)" + $(MAKE) -f makefile.mingwcross bin-release EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" bin-debug : @echo @echo "========== $(EXE) (debug) ==========" -# @echo Using compiler $(CC) -# @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_DEBUG) \ -# $(OPTIM_DEBUG) -# @echo + $(MAKE) builddate $(MAKE) -f makefile.mingwcross $(EXE) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ - LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_DEBUG)" + LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" bin-profile : @echo @echo "========== $(EXE) (profile) ==========" -# @echo Using compiler $(CC) -# @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_PROFILE) \ -# $(OPTIM_RELEASE) -# @echo + $(MAKE) builddate $(MAKE) -f makefile.mingwcross $(EXE) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_PROFILE)" + LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" bin-release : @echo @echo "========== $(EXE) (release) ==========" -# @echo Using compiler $(CC) -# @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_RELEASE) \ -# $(OPTIM_RELEASE) -# @echo + $(MAKE) builddate $(MAKE) -f makefile.mingwcross $(EXE) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_RELEASE)" + LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" + strip $(EXE) builddate: touch builddate.c .c.o: -# @echo " Compiling" $< $(DO_CC) -$(EXE_WGL): $(OBJ_COMMON) $(OBJ_WGL) -# @echo " Linking " $@ +$(EXE_WGL): $(OBJ_WGL) $(DO_LD) $(WGL_LIB) - strip $(EXE_WGL) -$(EXE_DED): $(OBJ_COMMON) $(OBJ_DED) -# @echo " Linking " $@ +$(EXE_DED): $(OBJ_DED) $(DO_LD) clean: