diff options
| author | kr3nshaw <20672068+kr3nshaw@users.noreply.github.com> | 2020-06-08 04:52:13 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 04:52:13 +1000 |
| commit | 4d7019cdaafee76f31dd69c9e1a932b9d192ee3c (patch) | |
| tree | 15f6ececa54560b4722ccbe1be8b85d80e503263 | |
| parent | 1aade2794c1b0a620b4d824ad1e2c5f69f13e26c (diff) | |
| parent | 98a0ac436c01d867566bfdd4ecda2e8603f2278d (diff) | |
Merge pull request #5 from PlatinumMaster/patch-3
GCC 9.
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tools/knarc/Makefile | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index c3e24b01..73c8210a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,18 @@ env: - LM_LICENSE_FILE="$TRAVIS_BUILD_DIR/tools/mwccarm/license.dat" addons: apt: + sources: + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + - sourceline: 'ppa:ubuntu-toolchain-r/test' packages: - gcc-multilib - linux-libc-dev - binutils-arm-none-eabi - wine32 - wine-stable - - gcc-8 - - g++-8 + - gcc-9 + - g++-9 cache: apt: true install: @@ -29,8 +33,6 @@ install: - mv NITRO\ SDK\ v3.0/include/nitro/specfiles/ARM9-TS.lcf.template arm9 script: - - 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 3a31e6dc..4e5e7971 100644 --- a/tools/knarc/Makefile +++ b/tools/knarc/Makefile @@ -1,3 +1,5 @@ +CXX ?= g++-9 + CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs SRCS := Source.cpp Narc.cpp @@ -9,7 +11,7 @@ all: knarc @: knarc: $(SRCS) $(HEADERS) - g++-8 $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) clean: $(RM) knarc knarc.exe |