archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-06 19:25:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build separate Zips for doom/doom2 and FreeDM

Browse source 
Consensus shows that the change in
2014-01-07T06:34:47Z!mikeonthecomputer@gmail.com was a bit too
extreme. Keep FreeDM as its own special thing, being much more focused
on multiplayer than the other IWADs, as well as being the
vanilla-compatible IWAD.
This commit is contained in:
Mike Swanson 2014-01-07 17:45:41 -08:00
parent 2912bd1ca1
commit 65eec022ea
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -34,10 +34,11 @@ DEUTEX=deutex
DEUTEX_BASIC_ARGS=-v0 -fullsnd -rate accept -rgb 0 255 255
DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
OBJS= \
$(WADS)/doom2.wad \
$(WADS)/doom.wad \
$(WADS)/freedm.wad
FREEDOOM1=$(WADS)/doom.wad
FREEDOOM2=$(WADS)/doom2.wad
FREEDM=$(WADS)/freedm.wad
OBJS=$(FREEDM) $(FREEDOOM1) $(FREEDOOM2)
all: $(OBJS)
@ -93,7 +94,7 @@ wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
#---------------------------------------------------------
# freedm iwad
$(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force
$(FREEDM): wadinfo_freedm.txt subdirs force
@mkdir -p $(WADS)
ln -sf freedm/texture1.txt textures/texture1.txt
rm -f $@
@ -102,7 +103,7 @@ $(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force
#---------------------------------------------------------
# doom2 iwad
$(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force
$(FREEDOOM2): wadinfo_iwad.txt subdirs force
@mkdir -p $(WADS)
ln -sf doom2/texture1.txt textures/texture1.txt
rm -f $@
@ -111,7 +112,7 @@ $(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force
#---------------------------------------------------------
# udoom iwad
$(WADS)/doom.wad: wadinfo_ult.txt subdirs force
$(FREEDOOM1): wadinfo_ult.txt subdirs force
@mkdir -p $(WADS)
ln -sf doom/texture1.txt textures/texture1.txt
rm -f $@
@ -121,8 +122,12 @@ doc: BUILD-SYSTEM.asc README.asc
asciidoc BUILD-SYSTEM.asc
asciidoc README.asc
DISTDOCS=COPYING CREDITS README.html
# Due to convoluted reasons, the WADs must directly proceed the game name.
dist: $(OBJS) doc
VERSION=$(VERSION) scripts/makepkgs $(OBJS)
VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
clean:
rm -f *.html deutex.log $(OBJS) \