diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-08 15:51:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 15:51:28 +0300 |
| commit | a9a1e08acac9dab227f0421be5f42128a9fd2537 (patch) | |
| tree | 884eb904c62c8fbf80d2dbf5ed8a90d5ddebf5aa | |
| parent | 5dfe3440383dd530bda24985f802d8c94bb452b8 (diff) | |
| parent | 1dd31333cf0734259f720fdcb5bbef5145d07292 (diff) | |
Merge pull request #148 from kr3nshaw/master
Fixed knarc makefile conflict with devkitARM
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tools/knarc/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -3,8 +3,8 @@ include config.mk include filesystem.mk -HOSTCC = $(CC) -HOSTCXX = $(CXX) +HOSTCC := $(CC) +HOSTCXX := $(CXX) HOSTCFLAGS = $(CFLAGS) HOSTCXXFLAGS = $(CXXFLAGS) diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile index 336fad3f..2e851af6 100644 --- a/tools/knarc/Makefile +++ b/tools/knarc/Makefile @@ -1,4 +1,4 @@ -CXX ?= g++-9 +CXX := g++ CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs |