From f759e35cd8399d8bffea4d59c5822db8f1002409 Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Sat, 28 Jul 2001 04:44:27 +0000 Subject: More compilation. Moved windows typedefs to a separate file. Included public domain md5 routines (from dpkg). --- Makefile | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index faf0902..220f7f0 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,19 @@ LDLIBS += `sdl-config --libs` AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow -ROOT = afont.c frustum.c kshape.c map.c maths.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c -AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cheatmodes.c comp_map.c comp_shp.c consolelog.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gameflow.c hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c movement.c paintball.c particle.c pfarlocs.c pheromon.c pmove.c psndproj.c pvisible.c +ROOT = afont.c frustum.c kshape.c map.c maths.c md5.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c +AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cheatmodes.c comp_map.c comp_shp.c consolelog.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gameflow.c hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c movement.c paintball.c particle.c pfarlocs.c pheromon.c pmove.c psndproj.c pvisible.c secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c +SHAPES = cube.c +SUPPORT = +AVPWIN95 = avpchunk.cpp +FRONTEND = +GADGETS = +WIN95 = huffman.cpp string.cpp + +# AVP: # unused?: avpitems.cpp avppages.cpp # not needed: mp_launch.c -# need fix: cconvars.cpp cdtrackselection.cpp davehook.cpp game_statistics.c gamecmds.cpp gamevars.cpp missions.cpp player.c psnd.c +# need fix: cconvars.cpp cdtrackselection.cpp davehook.cpp game_statistics.c gamecmds.cpp gamevars.cpp missions.cpp player.c psnd.c savegame.c scream.cpp # the following should really be autogenerated... @@ -26,9 +34,15 @@ ROOTSRC = $(ROOT) ROOTOBJ = $(call OBJNAMES1,$(ROOT)) AVPSRC = $(call SRCNAMES,$(AVP),avp) AVPOBJ = $(call OBJNAMES,$(AVP),avp) - -SRC = $(ROOTSRC) $(AVPSRC) -OBJ = $(ROOTOBJ) $(AVPOBJ) +SHAPESSRC = $(call SRCNAMES,$(SHAPES),avp/shapes) +SHAPESOBJ = $(call OBJNAMES,$(SHAPES),avp/shapes) +AVPWIN95SRC = $(call SRCNAMES,$(AVPWIN95),avp/win95) +AVPWIN95OBJ = $(call OBJNAMES,$(AVPWIN95),avp/win95) +WIN95SRC = $(call SRCNAMES,$(WIN95),win95) +WIN95OBJ = $(call OBJNAMES,$(WIN95),win95) + +SRC = $(ROOTSRC) $(AVPSRC) $(SHAPESSRC) $(AVPWIN95SRC) $(WIN95SRC) +OBJ = $(ROOTOBJ) $(AVPOBJ) $(SHAPESOBJ) $(AVPWIN95OBJ) $(WIN95OBJ) .SUFFIXES: .asm -- cgit v1.3