From ac98bf077bc6ec661e54210d8b3bc8ce687cede2 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 25 May 2003 22:38:29 +0000 Subject: [PATCH] no longer needed (makefile does it all now) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3037 d7cf8633-e32d-0410-b094-e92efae38249 --- makefile.mingw | 54 -------------- makefile.mingwcross | 170 -------------------------------------------- 2 files changed, 224 deletions(-) delete mode 100644 makefile.mingw delete mode 100644 makefile.mingwcross diff --git a/makefile.mingw b/makefile.mingw deleted file mode 100644 index 2b0d8fbb..00000000 --- a/makefile.mingw +++ /dev/null @@ -1,54 +0,0 @@ - -OBJECTS= builddate.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cmd.o \ - common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o r_sky.o \ - gl_rmain.o gl_rsurf.o host.o host_cmd.o image.o keys.o mathlib.o menu.o \ - model_alias.o model_brush.o model_shared.o model_sprite.o net_dgrm.o \ - net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o \ - sbar.o snd_dma.o snd_mem.o snd_mix.o sv_main.o sv_move.o \ - sv_phys.o sv_user.o sv_light.o view.o wad.o world.o zone.o vid_shared.o \ - palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o \ - r_modules.o r_explosion.o r_lerpanim.o protocol.o fs.o ui.o \ - portals.o sys_shared.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o \ - cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o \ - dpvsimpledecode.o wavefile.o meshqueue.o net_master.o r_shadow.o jpeg.o - -#K6/athlon optimizations -#CPUOPTIMIZATIONS=-march=k6 -#686 optimizations (note: crashs on k6, works on athlon) -#CPUOPTIMIZATIONS=-march=i686 -#generic (run on anything) -CPUOPTIMIZATIONS= - -#note: -#the -Werror can be removed to compile even if there are warnings, -#this is used to ensure that all released versions are free of warnings. - -OPTIMIZATIONS= -O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS) -#OPTIMIZATIONS= -O6 -fno-strict-aliasing -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations $(CPUOPTIMIZATIONS) -# -D WIN32 -D NDEBUG -D _WINDOWS -D _M_IX86 - -CFLAGS= -MD -Wall $(OPTIMIZATIONS) -LDFLAGS= -mwindows -luser32 -lgdi32 -lwinmm -ldxguid -ldinput -lopengl32 -lcomctl32 -lwsock32 - - -all: builddate darkplaces - -builddate: - del builddate.o - del builddate.d - -.c.o: - gcc $(CFLAGS) -c $*.c - -darkplaces: $(OBJECTS) vid_wgl.o sys_win.o snd_win.o net_bsd.o net_udp.o cd_win.o conproc.o - gcc -o $@ $^ $(LDFLAGS) - - -clean: - del darkplaces.exe - del *.o - del *.d - -.PHONY: clean builddate - --include *.d diff --git a/makefile.mingwcross b/makefile.mingwcross deleted file mode 100644 index df49d86c..00000000 --- a/makefile.mingwcross +++ /dev/null @@ -1,170 +0,0 @@ -##### Variables that you may want to modify ##### - -#choose the compiler you want to use -CC=gcc - -OBJ_SND=snd_win.o snd_dma.o snd_mix.o snd_mem.o -SOUNDLIB= - -OBJ_CD=cd_win.o - -#K6/athlon optimizations -#CPUOPTIMIZATIONS=-march=k6 -#note: don't use -march=athlon, every gcc which has it currently (2.96-3.1) -#have optimizer bugs (like entities disappearing randomly - a bug with -#compiling BOX_ON_PLANE_SIDE in mathlib.h) -#CPUOPTIMIZATIONS=-march=athlon -#686 optimizations -#CPUOPTIMIZATIONS=-march=i686 -#no specific CPU -CPUOPTIMIZATIONS= - - -##### Variables that you shouldn't care about ##### - -# Objects -CLIENTOBJECTS= cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \ - cl_main.o cl_parse.o cl_particles.o cl_screen.o cl_video.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_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 \ - sv_phys.o sv_user.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_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) - -# 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 -CFLAGS_COMMON=-MD -Wall -CFLAGS_DEBUG=-ggdb -CFLAGS_PROFILE=-g -pg -ggdb -CFLAGS_RELEASE= - -OPTIM_DEBUG= -# OPTIM_RELEASE= -O6 -fno-strict-aliasing -ffast-math -funroll-loops \ -# -fexpensive-optimizations $(CPUOPTIMIZATIONS) -OPTIM_RELEASE= -O2 -fno-strict-aliasing -ffast-math \ - -fexpensive-optimizations $(CPUOPTIMIZATIONS) - -DO_CC=$(CC) $(CFLAGS) -c $< -o $@ - - -# Link -LDFLAGS_WGL=-mwindows -luser32 -lgdi32 -lwinmm -ldxguid -ldinput -lcomctl32 -lwsock32 -LDFLAGS_DED=-mconsole -lwinmm -lwsock32 -LDFLAGS_DEBUG=-g -ggdb -LDFLAGS_PROFILE=-g -pg -LDFLAGS_RELEASE= - -EXE_WGL=darkplaces.exe -EXE_DED=darkplaces-dedicated.exe - -WGL_LIB= - -DO_LD=$(CC) -o $@ $^ $(LDFLAGS) - - -##### Commands ##### - -.PHONY : clean help \ - debug profile release \ - wgl-debug wgl-profile wgl-release \ - ded-debug ded-profile ded-release \ - -help: - @echo - @echo "===== Choose one =====" - @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 : - $(MAKE) -f makefile.mingwcross wgl-debug ded-debug - -profile : - $(MAKE) -f makefile.mingwcross wgl-profile ded-profile - -release : - $(MAKE) -f makefile.mingwcross wgl-release ded-release - -wgl-debug : - $(MAKE) -f makefile.mingwcross bin-debug EXE="$(EXE_WGL)" LDFLAGS_COMMON="$(LDFLAGS_WGL)" - -wgl-profile : - $(MAKE) -f makefile.mingwcross bin-profile EXE="$(EXE_WGL)" LDFLAGS_COMMON="$(LDFLAGS_WGL)" - -wgl-release : - $(MAKE) -f makefile.mingwcross bin-release EXE="$(EXE_WGL)" LDFLAGS_COMMON="$(LDFLAGS_WGL)" - -ded-debug : - $(MAKE) -f makefile.mingwcross bin-debug EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" - -ded-profile : - $(MAKE) -f makefile.mingwcross bin-profile EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" - -ded-release : - $(MAKE) -f makefile.mingwcross bin-release EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" - -bin-debug : - @echo - @echo "========== $(EXE) (debug) ==========" - $(MAKE) builddate - $(MAKE) -f makefile.mingwcross $(EXE) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\ - LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" - -bin-profile : - @echo - @echo "========== $(EXE) (profile) ==========" - $(MAKE) builddate - $(MAKE) -f makefile.mingwcross $(EXE) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" - -bin-release : - @echo - @echo "========== $(EXE) (release) ==========" - $(MAKE) builddate - $(MAKE) -f makefile.mingwcross $(EXE) \ - CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ - LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" - strip $(EXE) - -builddate: - touch builddate.c - -.c.o: - $(DO_CC) - -$(EXE_WGL): $(OBJ_WGL) - $(DO_LD) $(WGL_LIB) - -$(EXE_DED): $(OBJ_DED) - $(DO_LD) - -clean: - rm -f $(EXE_WGL) $(EXE_DED) *.o *.d - --include *.d -- 2.39.2