diff options
author | YamaArashi <shadow962@live.com> | 2016-06-28 22:33:31 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-06-28 22:33:31 -0700 |
commit | 8c55493c5a523cab5ce72988ae51b677ed52d6df (patch) | |
tree | f170edff4a113e71af0ba495e7c2ab832f6c5bda | |
parent | e9e1b988f9925a26518b76d74677d0d0dceb3b7c (diff) |
revert makefile change
-rw-r--r-- | Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -106,18 +106,20 @@ src/%_sapphire.o: src/%.c @printf ".text\n\t.align\t2, 0\n" >> src/$*_sapphire.s $(AS) $(ASFLAGS) -o $@ src/$*_sapphire.s -asm/%_ruby.o: $*_dep = $(shell $(SCANINC) asm/$*.s) -asm/%_sapphire.o: $*_dep = $(shell $(SCANINC) asm/$*.s) -asm/%_ruby.o: asm/%.s $$(%_dep) +asm/%_ruby.o: dep = $(shell $(SCANINC) asm/$*.s) +asm/%_sapphire.o: dep = $(shell $(SCANINC) asm/$*.s) + +asm/%_ruby.o: asm/%.s $$(dep) $(AS) $(ASFLAGS) --defsym RUBY=1 -o $@ $< -asm/%_sapphire.o: asm/%.s $$(%_dep) +asm/%_sapphire.o: asm/%.s $$(dep) $(AS) $(ASFLAGS) --defsym SAPPHIRE=1 -o $@ $< -data/%_ruby.o: $*_dep = $(shell $(SCANINC) data/$*.s) -data/%_sapphire.o: $*_dep = $(shell $(SCANINC) data/$*.s) -data/%_ruby.o: data/%.s $$(%_dep) +data/%_ruby.o: dep = $(shell $(SCANINC) data/$*.s) +data/%_sapphire.o: dep = $(shell $(SCANINC) data/$*.s) + +data/%_ruby.o: data/%.s $$(dep) $(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) --defsym RUBY=1 -o $@ -data/%_sapphire.o: data/%.s $$(%_dep) +data/%_sapphire.o: data/%.s $$(dep) $(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) --defsym SAPPHIRE=1 -o $@ ld_script_ruby.txt: ld_script.txt |