diff options
| author | kr3nshaw <20672068+kr3nshaw@users.noreply.github.com> | 2020-06-08 04:30:12 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 04:30:12 +1000 |
| commit | ff60ecd00a76db3fe747ecc38d0fa5e457426f85 (patch) | |
| tree | af350ba5e670a4d1bcfff318f4900b4a85963f0b | |
| parent | 2efa529b4d644f8a283785b191ccce90a47cd93e (diff) | |
| parent | aae365a639011638127c4895c5f86963053bc281 (diff) | |
Merge pull request #2 from PlatinumMaster/patch-1
Try to compile with gcc-8.
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | tools/knarc/Makefile | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index e5573ca0..e7a0c84a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: c env: global: - LM_LICENSE_FILE="$TRAVIS_BUILD_DIR/tools/mwccarm/license.dat" -addons: &gcc9 +addons: apt: packages: - gcc-multilib @@ -12,8 +12,7 @@ addons: &gcc9 - binutils-arm-none-eabi - wine32 - wine-stable - - gcc-9 - - g++-9 + - gcc-8 cache: apt: true install: @@ -29,8 +28,8 @@ install: - mv NITRO\ SDK\ v3.0/include/nitro/specfiles/ARM9-TS.lcf.template arm9 script: - - sudo ln -s /usr/bin/gcc-9 /usr/local/bin/gcc - - sudo ln -s /usr/bin/g++-9 /usr/local/bin/g++ + - sudo ln -s /usr/bin/gcc-8 /usr/local/bin/gcc + - sudo ln -s /usr/bin/g++-8 /usr/local/bin/g++ - make notifications: diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile index db803d8b..3f0e6492 100644 --- a/tools/knarc/Makefile +++ b/tools/knarc/Makefile @@ -1,7 +1,7 @@ all: knarc knarc: Source.cpp Narc.cpp - g++ -std=c++17 -lstdc++fs -o knarc Source.cpp Narc.cpp + g++ -std=c++17 -o knarc Source.cpp Narc.cpp -lstdc++fs clean: rm knarc |