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

textures: Strip out now-unused #defines from cfg.

Browse source 
Now that we always include all textures in every IWAD, the configuration
is significantly simpler. The #defines we previously used to control
the conditional logic are now redundant.
This commit is contained in:
Simon Howard 2019-09-01 20:56:40 -04:00
parent 8e9ce31b70
commit 340faf1205
2 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lumps/textures/Makefile
View file

@ -4,8 +4,7 @@ CPP=../../scripts/simplecpp
all: phase1/texture1.lmp phase2/texture1.lmp freedm/texture1.lmp all: phase1/texture1.lmp phase2/texture1.lmp freedm/texture1.lmp
phase1/texture1.lmp: textures.cfg phase1/texture1.lmp: textures.cfg
$(CPP) -DDOOM1 -DULTDOOM -DDOOM1_VERSIONS \ $(CPP) -DDOOM1_VERSIONS < textures.cfg | \
< textures.cfg | \
./build-textures -compat_texture1=doom1/texture1.txt \ ./build-textures -compat_texture1=doom1/texture1.txt \
-compat_texture2=doom1/texture2.txt \ -compat_texture2=doom1/texture2.txt \
-compat_pnames=doom1/pnames.txt \ -compat_pnames=doom1/pnames.txt \
@ -19,7 +18,7 @@ phase1/texture1.lmp: textures.cfg
cp phase1/pnames.lmp ../fd1pname.lmp cp phase1/pnames.lmp ../fd1pname.lmp
phase2/texture1.lmp: textures.cfg phase2/texture1.lmp: textures.cfg
$(CPP) -DDOOM1 -DDOOM2 < textures.cfg | \ $(CPP) < textures.cfg | \
./build-textures -compat_texture1=doom2/texture1.txt \ ./build-textures -compat_texture1=doom2/texture1.txt \
-compat_pnames=doom2/pnames.txt \ -compat_pnames=doom2/pnames.txt \
-output_texture1=phase2/texture1.lmp \ -output_texture1=phase2/texture1.lmp \
@ -30,7 +29,7 @@ phase2/texture1.lmp: textures.cfg
cp phase2/pnames.lmp ../fd2pname.lmp cp phase2/pnames.lmp ../fd2pname.lmp
freedm/texture1.lmp: textures.cfg freedm/texture1.lmp: textures.cfg
$(CPP) -DDOOM1 -DDOOM2 -DFREEDM < textures.cfg | \ $(CPP) -DFREEDM < textures.cfg | \
./build-textures -compat_texture1=doom2/texture1.txt \ ./build-textures -compat_texture1=doom2/texture1.txt \
-compat_pnames=doom2/pnames.txt \ -compat_pnames=doom2/pnames.txt \
-output_texture1=freedm/texture1.lmp \ -output_texture1=freedm/texture1.lmp \
@ -48,3 +47,4 @@ clean:
rm -f ../fd1txtr1.lmp ../fd1txtr2.lmp ../fd1pname.lmp \ rm -f ../fd1txtr1.lmp ../fd1txtr2.lmp ../fd1pname.lmp \
../fd2txtr1.lmp ../fd2pname.lmp \ ../fd2txtr1.lmp ../fd2pname.lmp \
../fdmtxtr1.lmp ../fdmpname.lmp ../fdmtxtr1.lmp ../fdmpname.lmp

17
lumps/textures/textures.cfg
View file

@ -9,28 +9,15 @@
; to allow specific sets of textures to be turned on or off. ; to allow specific sets of textures to be turned on or off.
; The following #defines are understood: ; The following #defines are understood:
; ;
; DOOM1 - Include textures that were available in doom.wad
; DOOM2 - Include textures that were available in doom2.wad
; ULTDOOM - Include doom.wad textures added in the Ultimate Doom
; FREEDM - Include extra textures used in FreeDM ; FREEDM - Include extra textures used in FreeDM
; DOOM1_VERSIONS - Some textures differ between doom.wad and doom2.wad ; DOOM1_VERSIONS - Some textures differ between doom.wad and doom2.wad
; versions. Usually we use the doom2.wad version; this ; versions. Usually we use the doom2.wad version; this
; specifies to use the doom.wad version instead. ; specifies to use the doom.wad version instead.
; ;
; Usually we always build with -DDOOM1 -DDOOM2 regardless of the IWAD ; Apart from the above exceptions, we always include the full set of
; being built: there's no reason not to include the full set of textures ; textures in all IWADs; there's no reason not to.
; from both original WADs.
; ;
#ifdef FREEDM
#define DOOM1
#define DOOM2
#endif
#ifdef DOOM2
#undef ULTDOOM
#endif
; the AA* textures have to be first, some ports (glboom) rely ; the AA* textures have to be first, some ports (glboom) rely
; on it ; on it