diff --git a/lumps/.gitignore b/lumps/.gitignore index 0cb1f28a..291c4124 100644 --- a/lumps/.gitignore +++ b/lumps/.gitignore @@ -6,3 +6,7 @@ playpal.lmp dmxgus.lmp # Copied from genmidi/ - genmidi.lmp +# Copied from textures/ - +???pname.lmp +???txtr1.lmp +???txtr2.lmp diff --git a/lumps/fd1pname.lmp b/lumps/fd1pname.lmp deleted file mode 120000 index 12100203..00000000 --- a/lumps/fd1pname.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/phase1/pnames.lmp \ No newline at end of file diff --git a/lumps/fd1txtr1.lmp b/lumps/fd1txtr1.lmp deleted file mode 120000 index 6b8378dc..00000000 --- a/lumps/fd1txtr1.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/phase1/texture1.lmp \ No newline at end of file diff --git a/lumps/fd1txtr2.lmp b/lumps/fd1txtr2.lmp deleted file mode 120000 index b41b8f6a..00000000 --- a/lumps/fd1txtr2.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/phase1/texture2.lmp \ No newline at end of file diff --git a/lumps/fd2pname.lmp b/lumps/fd2pname.lmp deleted file mode 120000 index 3c7ed1df..00000000 --- a/lumps/fd2pname.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/phase2/pnames.lmp \ No newline at end of file diff --git a/lumps/fd2txtr1.lmp b/lumps/fd2txtr1.lmp deleted file mode 120000 index fcfc9448..00000000 --- a/lumps/fd2txtr1.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/phase2/texture1.lmp \ No newline at end of file diff --git a/lumps/fdmpname.lmp b/lumps/fdmpname.lmp deleted file mode 120000 index a1f5b12b..00000000 --- a/lumps/fdmpname.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/freedm/pnames.lmp \ No newline at end of file diff --git a/lumps/fdmtxtr1.lmp b/lumps/fdmtxtr1.lmp deleted file mode 120000 index 4e1bb62b..00000000 --- a/lumps/fdmtxtr1.lmp +++ /dev/null @@ -1 +0,0 @@ -textures/freedm/texture1.lmp \ No newline at end of file diff --git a/lumps/textures/Makefile b/lumps/textures/Makefile index 26c0a601..165c43fa 100644 --- a/lumps/textures/Makefile +++ b/lumps/textures/Makefile @@ -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