Generate different titlepics for freedoom and freedm.

buildcfg.txt

@@ -500,6 +500,13 @@ D_DM2INT
 
 ; List of Pictures (with insertion point)
 [graphics]
+
+#ifdef FREEDM
+TITLEPIC 0 0          = dmttl
+#else
+TITLEPIC 0 0          = doomttl
+#endif
+
 #ifdef DOOM2
 HELP	0	0
 #endif
@@ -510,7 +517,6 @@ HELP2	0	0
 #endif
 #endif
 
-TITLEPIC	0	0
 CREDIT	0	0
 BOSSBACK	0	0
 AMMNUM0	-1	0

graphics/dmttl.ppm

@@ -0,0 +1 @@
+titlepic/freedm.ppm

graphics/doomttl.ppm

@@ -0,0 +1 @@
+titlepic/freedoom.ppm

graphics/titlepic.ppm

@@ -1 +0,0 @@
-titlepic/output.ppm

graphics/titlepic/Makefile

@@ -1,3 +1,8 @@
-titlepic: 
-	./create_caption
-#	pnmtopng < output.ppm > output.png
+titlepic: freedoom.ppm freedm.ppm
+
+freedoom.ppm: base.ppm
+	./create_caption Freedoom $@
+
+freedm.ppm: base.ppm
+	./create_caption FreeDM $@
+

graphics/titlepic/create_caption

@@ -5,12 +5,12 @@ DATE=`date +%Y/%m/%d`
 convert -fill white -font Helvetica-Bold                               \
   -pointsize 30                                                        \
     -gravity north                                                     \
-      -draw "text 0,30 Freedoom"                                       \
+      -draw "text 0,30 $1"                                             \
   -pointsize 11                                                        \
     -gravity southwest                                                 \
       -draw "text 5,5 'http://freedoom.sourceforge.net/'"              \
     -gravity southeast                                                 \
       -draw "text 10,25 'Version: $VERSION'"                           \
       -draw "text 10,5 '$DATE'"                                        \
-    base.ppm output.ppm
+    base.ppm $2
 

wadinfo-builder.pl

@@ -89,7 +89,7 @@ while (<STDIN>) {
 	 		if $section eq "texture1" ||
 			   $section eq "texture2";
 
-	} elsif (/^\s*(\S+)(\s*\=\s*(\S+))?/) {
+	} elsif (/^\s*(\S+)[^\=]*(\s*\=\s*(\S+))?/) {
 		
         my ($resname, $override) = ($1, $3);