diff options
| author | stag019 <stag019@gmail.com> | 2014-11-04 20:25:33 -0500 |
|---|---|---|
| committer | stag019 <stag019@gmail.com> | 2014-11-04 20:25:33 -0500 |
| commit | d8aa1f0d86caecd4077bcbf8b7ad9f226274fb72 (patch) | |
| tree | 863aff4603234e327a9fa42661177de27d09aa86 | |
| parent | cf29441457029c4ead96180057cd3c81d6d69786 (diff) | |
Stop preprocessing files.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile | 16 |
2 files changed, 4 insertions, 15 deletions
@@ -15,9 +15,6 @@ *.map *.sym -# generated -*.tx - # converted image data *.2bpp *.1bpp @@ -38,7 +38,7 @@ compare: # Clear the default suffixes. .SUFFIXES: -.SUFFIXES: .asm .tx .o .gbc .png .2bpp .1bpp .pic +.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: @@ -73,22 +73,14 @@ $(foreach obj, $(all_obj), \ %.1bpp: %.png ; $(eval 1bppq += $<) @rm -f $@ %.pic: %.2bpp ; $(eval picq += $<) @rm -f $@ -# Source files are not fed directly into rgbasm. -# A python preprocessor runs over them first, replacing ascii strings with correct character codes. -# It spits out the new file with extension .tx. -# The text preprocessor also uses a queue. -%.asm: ; -%.tx: %.asm ; $(eval txq += $<) @rm -f $@ - # Assemble source files into objects. # Queue payloads are here. These are made silent since there may be hundreds of targets. # Use rgbasm -h to use halts without nops. -$(all_obj): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_dep)) - @$(pre) $(txq); $(eval txq :=) +$(all_obj): $$*.asm $$($$*_dep) @$(gfx) 2bpp $(2bppq); $(eval 2bppq :=) @$(gfx) 1bpp $(1bppq); $(eval 1bppq :=) @$(pic) compress $(picq); $(eval picq :=) - rgbasm -h -o $@ $*.tx + rgbasm -h -o $@ $*.asm # Link objects together to build a rom. @@ -103,4 +95,4 @@ poke%.gbc: $$(%_obj) clean: rm -f $(roms) $(all_obj) - find . \( -iname '*.tx' -o -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + + find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + |