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

lumps: Eliminate symlinks for texture lumps.

Browse source 
Copy these to the parent directory to avoid needing symlinks.
More progress towards #202.
This commit is contained in:
Simon Howard 2015-12-24 11:26:31 +01:00
parent 0324308f37
commit 7902096915
9 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lumps/.gitignore vendored
View file

@ -6,3 +6,7 @@ playpal.lmp
dmxgus.lmp
# Copied from genmidi/ -
genmidi.lmp
# Copied from textures/ -
???pname.lmp
???txtr1.lmp
???txtr2.lmp

1
lumps/fd1pname.lmp
View file

@ -1 +0,0 @@
textures/phase1/pnames.lmp

1
lumps/fd1txtr1.lmp
View file

@ -1 +0,0 @@
textures/phase1/texture1.lmp

1
lumps/fd1txtr2.lmp
View file

@ -1 +0,0 @@
textures/phase1/texture2.lmp

1
lumps/fd2pname.lmp
View file

@ -1 +0,0 @@
textures/phase2/pnames.lmp

1
lumps/fd2txtr1.lmp
View file

@ -1 +0,0 @@
textures/phase2/texture1.lmp

1
lumps/fdmpname.lmp
View file

@ -1 +0,0 @@
textures/freedm/pnames.lmp

1
lumps/fdmtxtr1.lmp
View file

@ -1 +0,0 @@
textures/freedm/texture1.lmp

42
lumps/textures/Makefile
View file

@ -7,32 +7,38 @@ phase1/texture1.lmp: textures.cfg
$(CPP) -DDOOM1 -DULTDOOM < textures.cfg | \
./build-textures -compat_texture1=doom1/texture1.txt \
-compat_texture2=doom1/texture2.txt \
-compat_pnames=doom1/pnames.txt \
-output_texture1=phase1/texture1.lmp \
-output_texture2=phase1/texture2.lmp \
-output_pnames=phase1/pnames.lmp \
-output_pnames_txt=phase1/pnames.txt
-compat_pnames=doom1/pnames.txt \
-output_texture1=phase1/texture1.lmp \
-output_texture2=phase1/texture2.lmp \
-output_pnames=phase1/pnames.lmp \
-output_pnames_txt=phase1/pnames.txt
cp phase1/texture1.lmp ../fd1txtr1.lmp
cp phase1/texture2.lmp ../fd1txtr2.lmp
cp phase1/pnames.lmp ../fd1pname.lmp
phase2/texture1.lmp: textures.cfg
$(CPP) -DDOOM1 -DDOOM2 < textures.cfg | \
./build-textures -compat_texture1=doom2/texture1.txt \
-compat_pnames=doom2/pnames.txt \
-output_texture1=phase2/texture1.lmp \
-output_pnames=phase2/pnames.lmp \
-output_pnames_txt=phase2/pnames.txt
-compat_pnames=doom2/pnames.txt \
-output_texture1=phase2/texture1.lmp \
-output_pnames=phase2/pnames.lmp \
-output_pnames_txt=phase2/pnames.txt
cp phase2/texture1.lmp ../fd2txtr1.lmp
cp phase2/pnames.lmp ../fd2pname.lmp
freedm/texture1.lmp: textures.cfg
$(CPP) -DDOOM1 -DDOOM2 -DFREEDM < textures.cfg | \
./build-textures -compat_texture1=doom2/texture1.txt \
-compat_pnames=doom2/pnames.txt \
-output_texture1=freedm/texture1.lmp \
-output_pnames=freedm/pnames.lmp \
-output_pnames_txt=freedm/pnames.txt
-compat_pnames=doom2/pnames.txt \
-output_texture1=freedm/texture1.lmp \
-output_pnames=freedm/pnames.lmp \
-output_pnames_txt=freedm/pnames.txt
cp freedm/texture1.lmp ../fdmtxtr1.lmp
cp freedm/pnames.lmp ../fdmpname.lmp
clean:
rm -f phase1/texture1.lmp phase1/texture2.lmp phase1/pnames.lmp \
phase1/pnames.txt \
phase2/texture1.lmp phase2/pnames.lmp phase2/pnames.txt \
freedm/texture1.lmp freedm/pnames.lmp freedm/pnames.txt
rm -f phase1/texture1.lmp phase2/texture1.lmp freedm/texture1.lmp \
phase1/texture2.lmp \
phase1/pnames.lmp phase2/pnames.lmp freedm/pnames.lmp \
phase1/pnames.txt phase2/pnames.txt freedm/pnames.txt