diff --git a/Makefile b/Makefile index 17907e42..32a8cde1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VERSION=$(shell git describe --dirty 2>/dev/null || cat VERSION) WADS=wads CPP=scripts/simplecpp DEUTEX=deutex -DEUTEX_BASIC_ARGS=-v0 -rate accept -rgb 0 255 255 +DEUTEX_BASIC_ARGS=-v0 -rate accept DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/ FREEDOOM1=$(WADS)/freedoom1.wad @@ -62,7 +62,7 @@ $(FREEDM): wadinfo_freedm.txt subdirs $(FREEDOOM1): wadinfo_phase1.txt subdirs @mkdir -p $(WADS) rm -f $@ - $(DEUTEX) $(DEUTEX_ARGS) -iwad -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_phase1.txt $@ + $(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_phase1.txt $@ #--------------------------------------------------------- # phase 2 (doom2) iwad @@ -70,7 +70,7 @@ $(FREEDOOM1): wadinfo_phase1.txt subdirs $(FREEDOOM2): wadinfo_phase2.txt subdirs @mkdir -p $(WADS) rm -f $@ - $(DEUTEX) $(DEUTEX_ARGS) -iwad -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_phase2.txt $@ + $(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_phase2.txt $@ %.html: %.adoc TZ=UTC asciidoc $< diff --git a/graphics/text/smtextgen b/graphics/text/smtextgen index 799c91ba..cba9f038 100755 --- a/graphics/text/smtextgen +++ b/graphics/text/smtextgen @@ -11,7 +11,7 @@ import re from common import * # Background color for output files. -BACKGROUND_COLOR = '#00ffff' +BACKGROUND_COLOR = None # Width of a space character in pixels. SPACE_WIDTH = 4 @@ -142,10 +142,12 @@ for xy, string in args['strings']: command_line.extend(smallfont.draw_commands_for_text( string, xy[0], xy[1])) -command_line.extend(( - '-background', BACKGROUND_COLOR, - '-flatten', args['filename'], -)) +if BACKGROUND_COLOR is not None: + command_line.extend(( + '-background', BACKGROUND_COLOR, + '-flatten' + )) +command_line.extend((args['filename'],)) invoke_command(command_line) diff --git a/graphics/text/textgen b/graphics/text/textgen index fc8ffcc4..fb8471f3 100755 --- a/graphics/text/textgen +++ b/graphics/text/textgen @@ -18,7 +18,7 @@ COLOR_RED = (0, 100, 100) COLOR_WHITE = (0, 0, 0) # Background color for output files. -BACKGROUND_COLOR = '#00ffff' +BACKGROUND_COLOR = None # Height of font in pixels. FONT_HEIGHT = 15