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

Sharewarendectomy

Browse source 
Consensus that the "shareware" target was no longer necessary was
reached long ago[1]. It just needs to actually get done. Thus:

Makefile:
- remove shareware targets

buildcfg.txt, textures/combined.txt:
- remove #ifdef/#ifndef SHAREWARE sections (almost entirely #ifndef)

graphics/help2.gif:
- remove symlink, help2 screen was shareware-only

gitignore:
- remove shareware files no longer built

textures/shareware:
- remove directory

--
[1] http://www.doomworld.com/vb/freedoom/52758-removing-shareware/ .

In particular, Jon wrote:
>The original purpose of the shareware IWAD was to have a smaller set of
>resources to target 100% completion of. That was probably met a long
>time ago.

More recently chungy wrote in <http://www.doomworld.com/vb/post/957707>
>Removing the "demo"/"shareware" version of Freedoom has been discussed
>but it's never been done. Actually it's a bit easier to just leave it
>in than to remove it. (It'd be pretty easy to get rid of it anyway, but
>nothing is really gained from it)

Signed-off-by: RjY <rjy@users.sourceforge.net>
This commit is contained in:
RjY 2011-04-10 10:07:34 +01:00
parent 95d9c8c092
commit 3d56b50b81
6 changed files with 7 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Makefile
View file

@ -38,7 +38,6 @@ OBJS = \
$(WADS)/freedoom_sprites.wad \
$(WADS)/freedoom_sounds.wad \
$(WADS)/freedoom_textures.wad \
$(WADS)/doom1.wad \
$(WADS)/doom2.wad \
$(WADS)/doom.wad \
$(WADS)/freedm.wad
@ -62,11 +61,7 @@ textures/doom/texture1.txt: textures/combined.txt
$(CPP) -DDOOM1 -DULTDOOM < $< > $@
textures/freedm/texture1.txt: textures/combined.txt
$(CPP) -DFREEDM < $< > $@
textures/shareware/texture1.txt: textures/combined.txt
$(CPP) -DSHAREWARE < $< > $@
textures/shareware/pnames.txt: textures/shareware/texture1.txt
scripts/extract-pnames.py < $< > $@
textures/doom/pnames.txt: textures/doom/texture1.txt
scripts/extract-pnames.py -a > $@
textures/doom2/pnames.txt: textures/doom2/texture1.txt
@ -78,8 +73,6 @@ textures/freedm/pnames.txt: textures/freedm/texture1.txt
wadinfo.txt: buildcfg.txt force textures/doom2/pnames.txt
$(CPP) -P -DDOOM2 < $< | scripts/wadinfo-builder.py > $@
wadinfo_sw.txt: buildcfg.txt force textures/shareware/pnames.txt
$(CPP) -P -DSHAREWARE < $< | scripts/wadinfo-builder.py -dummy > $@
wadinfo_iwad.txt: buildcfg.txt force textures/doom2/pnames.txt
$(CPP) -P -DDOOM2 < $< | scripts/wadinfo-builder.py -dummy > $@
wadinfo_ult.txt: buildcfg.txt force textures/doom/pnames.txt
@ -93,6 +86,10 @@ wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
md5sum $<.gz > $<.md5sum
rm -f $<
# deutex doesnt allow redirects for the filenames in the texture
# entries, so we have to change the texture1 symlink to point
# to whichever wad we are working on
#---------------------------------------------------------
# build wad
@ -154,17 +151,7 @@ $(WADS)/freedoom_sounds.wad : wadinfo.txt force
rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -sounds -musics -build wadinfo.txt $@
#---------------------------------------------------------
# shareware iwad
#
# deutex doesnt allow redirects for the filenames in the texture
# entries, so we have to change the texture1 symlink to point
# to the shareware wad
$(WADS)/doom1.wad : wadinfo_sw.txt force
ln -sf shareware/texture1.txt textures/texture1.txt
rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_sw.txt $@
dist : $(OBJS)
scripts/makepkgs $(OBJS)
@ -186,8 +173,6 @@ clean:
./textures/doom2/texture1.txt \
./textures/freedm/pnames.txt \
./textures/freedm/texture1.txt \
./textures/shareware/pnames.txt \
./textures/shareware/texture1.txt \
./textures/texture1.txt
make -C lumps clean