summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-05-05 16:07:03 +0200
committerYamaArashi <YamaArashi@users.noreply.github.com>2017-05-05 15:13:19 -0700
commit9c41a78a1a1635ff891d7384f3a437c2bf43809e (patch)
tree78a99df355b84c4487df338a19bf864546a453c2
parent7e071a97ad1b7df8d21d5f6c147a62ead0825940 (diff)
Build German ROM on Travis
-rw-r--r--.travis.yml1
-rw-r--r--Makefile24
2 files changed, 15 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 1c1114e49..693b6bf69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,3 +28,4 @@ script:
- make -j2 compare_sapphire
- make -j2 compare_sapphire_rev1
- make -j2 compare_sapphire_rev2
+ - make -j2 ruby_de
diff --git a/Makefile b/Makefile
index 073bab0ee..f9f14bab4 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen
REVISION := 0
-VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2
+VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_de
# Clear the default suffixes.
.SUFFIXES:
@@ -123,21 +123,24 @@ $1_OBJS_REL := $$($1_OBJS_REL:sound/%=../../sound/%)
$$($1_C_OBJS): VERSION := $2
$$($1_C_OBJS): REVISION := $3
+$$($1_C_OBJS): LANGUAGE := $4
build/$1/%.o : %.c $$$$(c_dep)
- @$$(CPP) $$(CPPFLAGS) -D $$(VERSION) -D REVISION=$$(REVISION) $$< -o build/$1/$$*.i
+ @$$(CPP) $$(CPPFLAGS) -D $$(VERSION) -D REVISION=$$(REVISION) -D $$(LANGUAGE) $$< -o build/$1/$$*.i
@$$(PREPROC) build/$1/$$*.i charmap.txt | $$(CC1) $$(CFLAGS) -o build/$1/$$*.s
@printf ".text\n\t.align\t2, 0\n" >> build/$1/$$*.s
$$(AS) $$(ASFLAGS) -o $$@ build/$1/$$*.s
$$($1_ASM_OBJS): VERSION := $2
$$($1_ASM_OBJS): REVISION := $3
+$$($1_ASM_OBJS): LANGUAGE := $4
build/$1/asm/%.o: asm/%.s $$$$(asm_dep)
- $$(AS) $$(ASFLAGS) --defsym $$(VERSION)=1 --defsym REVISION=$$(REVISION) -o $$@ $$<
+ $$(AS) $$(ASFLAGS) --defsym $$(VERSION)=1 --defsym REVISION=$$(REVISION) --defsym $$(LANGUAGE)=1 -o $$@ $$<
$$($1_DATA_ASM_OBJS): VERSION := $2
$$($1_DATA_ASM_OBJS): REVISION := $3
+$$($1_DATA_ASM_OBJS): LANGUAGE := $4
build/$1/data/%.o: data/%.s $$$$(asm_dep)
- $$(PREPROC) $$< charmap.txt | $$(AS) $$(ASFLAGS) --defsym $$(VERSION)=1 --defsym REVISION=$$(REVISION) -o $$@
+ $$(PREPROC) $$< charmap.txt | $$(AS) $$(ASFLAGS) --defsym $$(VERSION)=1 --defsym REVISION=$$(REVISION) --defsym $$(LANGUAGE)=1 -o $$@
build/$1/sym_bss.ld: sym_bss.txt
cd build/$1 && ../../$$(RAMSCRGEN) .bss ../../sym_bss.txt >sym_bss.ld
@@ -164,9 +167,10 @@ $1: poke$1.gba
@:
endef
-$(eval $(call VERSION_RULES,ruby,RUBY,0))
-$(eval $(call VERSION_RULES,ruby_rev1,RUBY,1))
-$(eval $(call VERSION_RULES,ruby_rev2,RUBY,2))
-$(eval $(call VERSION_RULES,sapphire,SAPPHIRE,0))
-$(eval $(call VERSION_RULES,sapphire_rev1,SAPPHIRE,1))
-$(eval $(call VERSION_RULES,sapphire_rev2,SAPPHIRE,2))
+$(eval $(call VERSION_RULES,ruby,RUBY,0,ENGLISH))
+$(eval $(call VERSION_RULES,ruby_rev1,RUBY,1,ENGLISH))
+$(eval $(call VERSION_RULES,ruby_rev2,RUBY,2,ENGLISH))
+$(eval $(call VERSION_RULES,sapphire,SAPPHIRE,0,ENGLISH))
+$(eval $(call VERSION_RULES,sapphire_rev1,SAPPHIRE,1,ENGLISH))
+$(eval $(call VERSION_RULES,sapphire_rev2,SAPPHIRE,2,ENGLISH))
+$(eval $(call VERSION_RULES,ruby_de,RUBY,0,GERMAN))