diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | config.mk | 2 |
4 files changed, 24 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 760b36628..64c9e3230 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ build/ .vs/ .projects/ARM/ *.diff +porymap.project.cfg diff --git a/.travis.yml b/.travis.yml index cae4335e3..25918795a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,12 @@ matrix: env: _="Build" script: - make tools CXX=g++-7 - - make -j2 ruby - - make -j2 ruby_rev1 - - make -j2 ruby_rev2 - - make -j2 sapphire - - make -j2 sapphire_rev1 - - make -j2 sapphire_rev2 + - make -j2 compare_ruby + - make -j2 compare_ruby_rev1 + - make -j2 compare_ruby_rev2 + - make -j2 compare_sapphire + - make -j2 compare_sapphire_rev1 + - make -j2 compare_sapphire_rev2 - os: linux addons: apt: @@ -47,7 +47,7 @@ matrix: env: _="Build Nonmatching" script: - make tools CXX=g++-7 - - make -j2 ruby NONMATCHING=1 COMPARE=0 + - make -j2 ruby NONMATCHING=1 - os: linux addons: apt: @@ -62,8 +62,8 @@ matrix: - rsync -avhI graphics-de/ graphics/ script: - make tools CXX=g++-7 - - make -j2 ruby_de - - make -j2 sapphire_de - - make -j2 ruby_de_debug + - make -j2 compare_ruby_de + - make -j2 compare_sapphire_de + - make -j2 compare_ruby_de_debug after_success: - .travis/calcrom/webhook.sh pokeruby @@ -7,7 +7,6 @@ else EXE := endif - #### Tools #### SHELL := /bin/bash -o pipefail @@ -114,6 +113,8 @@ ifeq ($(COMPARE),1) @$(SHA1SUM) $(BUILD_NAME).sha1 endif +compare: ; @$(MAKE) COMPARE=1 + clean: tidy find sound/direct_sound_samples \( -iname '*.bin' \) -exec rm {} + $(RM) $(ALL_OBJECTS) @@ -187,6 +188,16 @@ sapphire_de: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN ruby_de_debug: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1 ruby_en_debug: ; @$(MAKE) GAME_VERSION=RUBY DEBUG=1 DEBUG_TRANSLATE=1 +compare_ruby: ; @$(MAKE) GAME_VERSION=RUBY COMPARE=1 +compare_ruby_rev1: ; @$(MAKE) GAME_VERSION=RUBY GAME_REVISION=1 COMPARE=1 +compare_ruby_rev2: ; @$(MAKE) GAME_VERSION=RUBY GAME_REVISION=2 COMPARE=1 +compare_sapphire: ; @$(MAKE) GAME_VERSION=SAPPHIRE COMPARE=1 +compare_sapphire_rev1: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=1 COMPARE=1 +compare_sapphire_rev2: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=2 COMPARE=1 +compare_ruby_de: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN COMPARE=1 +compare_sapphire_de: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN COMPARE=1 +compare_ruby_de_debug: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1 COMPARE=1 +compare_ruby_en_debug: ; @$(MAKE) GAME_VERSION=RUBY DEBUG=1 DEBUG_TRANSLATE=1 COMPARE=1 #### Graphics Rules #### @@ -6,7 +6,7 @@ GAME_REVISION ?= 0 GAME_LANGUAGE ?= ENGLISH DEBUG ?= 0 DEBUG_TRANSLATE ?= 0 -COMPARE ?= 1 +COMPARE ?= 0 # For gbafix MAKER_CODE := 01 |