diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-08 09:46:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-08 09:46:34 -0400 |
| commit | d0b478e833f45cc9d35e19eecefec5b19c97e1c5 (patch) | |
| tree | fd712213688c80cd0cdee04a73926820015a0a6e | |
| parent | fb938eada97e211193fc0836d3039bbe3abe126c (diff) | |
| parent | a9a1e08acac9dab227f0421be5f42128a9fd2537 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
| -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 |