Merge pull request #2 from PlatinumMaster/patch-1

Try to compile with gcc-8.
This commit is contained in:
kr3nshaw
2020-06-08 04:30:12 +10:00
committed by GitHub
2 changed files with 5 additions and 6 deletions

View File

@@ -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:

View File

@@ -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