From 83774ecd9d44b3729d6cd0b534e6c6c3e27316e4 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Tue, 13 Jun 2006 11:40:12 +0000 Subject: [PATCH] fix building :) inverse logig in wadinfo-builder.pl use of if/ifdef in textures/combined.txt roll-back addition of symlinks to dummy --- lumps/demo1.lmp | 1 - lumps/demo2.lmp | 1 - lumps/demo3.lmp | 1 - sounds/dsbospit.wav | 1 - sounds/dsbospn.wav | 1 - sounds/dsbspact.wav | 1 - sounds/dsbspdth.wav | 1 - sounds/dsbspwlk.wav | 1 - sounds/dscybdth.wav | 1 - sounds/dscybsit.wav | 1 - sounds/dsdmact.wav | 1 - sounds/dsdmpain.wav | 1 - sounds/dsfirsht.wav | 1 - sounds/dsfirxpl.wav | 1 - sounds/dsflamst.wav | 1 - sounds/dshoof.wav | 1 - sounds/dsmanatk.wav | 1 - sounds/dsmansit.wav | 1 - sounds/dsmetal.wav | 1 - sounds/dsmnpain.wav | 1 - sounds/dspdiehi.wav | 1 - sounds/dspodth1.wav | 1 - sounds/dspodth2.wav | 1 - sounds/dspodth3.wav | 1 - sounds/dspunch.wav | 1 - sounds/dsradio.wav | 1 - sounds/dsrlaunc.wav | 1 - sounds/dssawful.wav | 1 - sounds/dssawhit.wav | 1 - sounds/dssawidl.wav | 1 - sounds/dssawup.wav | 1 - sounds/dsskeact.wav | 1 - sounds/dsskeatk.wav | 1 - sounds/dsskedth.wav | 1 - sounds/dsskepch.wav | 1 - sounds/dsskldth.wav | 1 - sounds/dsspidth.wav | 1 - sounds/dsspisit.wav | 1 - sounds/dsssdth.wav | 1 - sounds/dssssit.wav | 1 - textures/combined.txt | 2 +- wadinfo-builder.pl | 2 +- 42 files changed, 2 insertions(+), 42 deletions(-) delete mode 120000 lumps/demo1.lmp delete mode 120000 lumps/demo2.lmp delete mode 120000 lumps/demo3.lmp delete mode 120000 sounds/dsbospit.wav delete mode 120000 sounds/dsbospn.wav delete mode 120000 sounds/dsbspact.wav delete mode 120000 sounds/dsbspdth.wav delete mode 120000 sounds/dsbspwlk.wav delete mode 120000 sounds/dscybdth.wav delete mode 120000 sounds/dscybsit.wav delete mode 120000 sounds/dsdmact.wav delete mode 120000 sounds/dsdmpain.wav delete mode 120000 sounds/dsfirsht.wav delete mode 120000 sounds/dsfirxpl.wav delete mode 120000 sounds/dsflamst.wav delete mode 120000 sounds/dshoof.wav delete mode 120000 sounds/dsmanatk.wav delete mode 120000 sounds/dsmansit.wav delete mode 120000 sounds/dsmetal.wav delete mode 120000 sounds/dsmnpain.wav delete mode 120000 sounds/dspdiehi.wav delete mode 120000 sounds/dspodth1.wav delete mode 120000 sounds/dspodth2.wav delete mode 120000 sounds/dspodth3.wav delete mode 120000 sounds/dspunch.wav delete mode 120000 sounds/dsradio.wav delete mode 120000 sounds/dsrlaunc.wav delete mode 120000 sounds/dssawful.wav delete mode 120000 sounds/dssawhit.wav delete mode 120000 sounds/dssawidl.wav delete mode 120000 sounds/dssawup.wav delete mode 120000 sounds/dsskeact.wav delete mode 120000 sounds/dsskeatk.wav delete mode 120000 sounds/dsskedth.wav delete mode 120000 sounds/dsskepch.wav delete mode 120000 sounds/dsskldth.wav delete mode 120000 sounds/dsspidth.wav delete mode 120000 sounds/dsspisit.wav delete mode 120000 sounds/dsssdth.wav delete mode 120000 sounds/dssssit.wav diff --git a/lumps/demo1.lmp b/lumps/demo1.lmp deleted file mode 120000 index 9cb09c75..00000000 --- a/lumps/demo1.lmp +++ /dev/null @@ -1 +0,0 @@ -dummy.lmp \ No newline at end of file diff --git a/lumps/demo2.lmp b/lumps/demo2.lmp deleted file mode 120000 index 9cb09c75..00000000 --- a/lumps/demo2.lmp +++ /dev/null @@ -1 +0,0 @@ -dummy.lmp \ No newline at end of file diff --git a/lumps/demo3.lmp b/lumps/demo3.lmp deleted file mode 120000 index 9cb09c75..00000000 --- a/lumps/demo3.lmp +++ /dev/null @@ -1 +0,0 @@ -dummy.lmp \ No newline at end of file diff --git a/sounds/dsbospit.wav b/sounds/dsbospit.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsbospit.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsbospn.wav b/sounds/dsbospn.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsbospn.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsbspact.wav b/sounds/dsbspact.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsbspact.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsbspdth.wav b/sounds/dsbspdth.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsbspdth.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsbspwlk.wav b/sounds/dsbspwlk.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsbspwlk.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dscybdth.wav b/sounds/dscybdth.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dscybdth.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dscybsit.wav b/sounds/dscybsit.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dscybsit.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsdmact.wav b/sounds/dsdmact.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsdmact.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsdmpain.wav b/sounds/dsdmpain.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsdmpain.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsfirsht.wav b/sounds/dsfirsht.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsfirsht.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsfirxpl.wav b/sounds/dsfirxpl.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsfirxpl.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsflamst.wav b/sounds/dsflamst.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsflamst.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dshoof.wav b/sounds/dshoof.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dshoof.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsmanatk.wav b/sounds/dsmanatk.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsmanatk.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsmansit.wav b/sounds/dsmansit.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsmansit.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsmetal.wav b/sounds/dsmetal.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsmetal.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsmnpain.wav b/sounds/dsmnpain.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsmnpain.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dspdiehi.wav b/sounds/dspdiehi.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dspdiehi.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dspodth1.wav b/sounds/dspodth1.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dspodth1.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dspodth2.wav b/sounds/dspodth2.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dspodth2.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dspodth3.wav b/sounds/dspodth3.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dspodth3.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dspunch.wav b/sounds/dspunch.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dspunch.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsradio.wav b/sounds/dsradio.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsradio.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsrlaunc.wav b/sounds/dsrlaunc.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsrlaunc.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dssawful.wav b/sounds/dssawful.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dssawful.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dssawhit.wav b/sounds/dssawhit.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dssawhit.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dssawidl.wav b/sounds/dssawidl.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dssawidl.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dssawup.wav b/sounds/dssawup.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dssawup.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsskeact.wav b/sounds/dsskeact.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsskeact.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsskeatk.wav b/sounds/dsskeatk.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsskeatk.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsskedth.wav b/sounds/dsskedth.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsskedth.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsskepch.wav b/sounds/dsskepch.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsskepch.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsskldth.wav b/sounds/dsskldth.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsskldth.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsspidth.wav b/sounds/dsspidth.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsspidth.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsspisit.wav b/sounds/dsspisit.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsspisit.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dsssdth.wav b/sounds/dsssdth.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dsssdth.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/sounds/dssssit.wav b/sounds/dssssit.wav deleted file mode 120000 index 707462d2..00000000 --- a/sounds/dssssit.wav +++ /dev/null @@ -1 +0,0 @@ -dummy.wav \ No newline at end of file diff --git a/textures/combined.txt b/textures/combined.txt index 61e56e2b..1ca4f5ca 100644 --- a/textures/combined.txt +++ b/textures/combined.txt @@ -310,7 +310,7 @@ TEKWALL5 128 128 #endif -#if DOOM2 +#ifdef DOOM2 ; these textures are in doom 2, but not doom 1: diff --git a/wadinfo-builder.pl b/wadinfo-builder.pl index 178c2eef..ce149780 100755 --- a/wadinfo-builder.pl +++ b/wadinfo-builder.pl @@ -75,7 +75,7 @@ while () { $filename = findfile($section, $resname); } - if ($filename) { + if (!$filename) { if ($dummy) { # this hasnt been submitted yet - use a dummy lump