From 24764e2481b702655329fb810ed1ae34067cd4ed Mon Sep 17 00:00:00 2001 From: PlatinumMaster Date: Sun, 7 Jun 2020 14:24:18 -0400 Subject: Change order of linked files. --- tools/knarc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 095ec6748161ae816806ab09d9a353d25384eab2 Mon Sep 17 00:00:00 2001 From: PlatinumMaster Date: Sun, 7 Jun 2020 14:24:49 -0400 Subject: Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5573ca0..232716fc 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: -- cgit v1.2.3 From aae365a639011638127c4895c5f86963053bc281 Mon Sep 17 00:00:00 2001 From: PlatinumMaster Date: Sun, 7 Jun 2020 14:25:02 -0400 Subject: Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 232716fc..e7a0c84a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,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: -- cgit v1.2.3