diff options
| author | garak <garakmon@gmail.com> | 2019-08-01 18:59:29 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-08-01 18:59:29 -0400 |
| commit | ca6b89f5ffd5c8e101d06469765089e0f30fc92d (patch) | |
| tree | bee597e9a7b194e08214f91005a5a2e24566fa03 | |
| parent | 7f55a6ce8625b36d2ff68380654c779cc9bc005b (diff) | |
fix build
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | src/wild_encounter.c | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2d7560c92..37dd007c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,15 @@ install: matrix: include: - os: linux + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 env: _="Build" script: + - make tools CXX=g++-7 - make -j2 ruby - make -j2 ruby_rev1 - make -j2 ruby_rev2 @@ -31,12 +38,19 @@ matrix: - make -j2 sapphire_rev1 - make -j2 sapphire_rev2 - os: linux + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 env: _="Build German" before_script: - cp override-de.mk override.mk - rsync -avhI data-de/ data/ - rsync -avhI graphics-de/ graphics/ script: + - make tools CXX=g++-7 - make -j2 ruby_de - make -j2 sapphire_de - make -j2 ruby_de_debug diff --git a/src/wild_encounter.c b/src/wild_encounter.c index fc0d9e45d..ec689b3b7 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -17,7 +17,6 @@ #include "tv.h" #include "data/wild_encounters.h" -//#include "data/we_ruby.h" const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS}; |