diff options
| author | kr3nshaw <20672068+kr3nshaw@users.noreply.github.com> | 2020-06-08 03:18:50 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 03:18:50 +1000 |
| commit | bc4f89e2ba8a1fda915099e7e680a45beed2b0ae (patch) | |
| tree | e21da7483d5256c10bc7b718ec1b27728152730c | |
| parent | f1bc71afe289152f60eaaf42a0267be26ee16431 (diff) | |
| parent | cafc25c1fe5a7c856e111ac06fa3389988d04aa5 (diff) | |
Merge pull request #1 from PlatinumMaster/master
Attempt to fix travis for knarc.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tools/knarc/Makefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 5ce0b5e9..0a8b0971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ addons: - binutils-arm-none-eabi - wine32 - wine-stable + - gcc-8 + - g++-8 cache: apt: true install: diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile index a466912c..da52e871 100644 --- a/tools/knarc/Makefile +++ b/tools/knarc/Makefile @@ -1,7 +1,7 @@ all: knarc knarc: Source.cpp Narc.cpp - g++ -std=c++17 -o knarc Source.cpp Narc.cpp + g++8 -std=c++17 -o knarc Source.cpp Narc.cpp clean: - rm knarc + rm knarc
\ No newline at end of file |