Mercurial > hg > piper-cpp
changeset 267:febeaa54bd81
Let's try std=c++1y, see if this gets us sensible behaviour on both
Linux and Mac Travis builds (effectively we need C++11 on the former and
C++14 on the latter)
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Sat, 13 Oct 2018 12:32:53 +0100 |
| parents | 234f89708d75 |
| children | a50a8c104bd8 |
| files | Makefile |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Oct 13 12:32:03 2018 +0100 +++ b/Makefile Sat Oct 13 12:32:53 2018 +0100 @@ -7,7 +7,9 @@ OPTFLAGS := -O3 -fPIC CFLAGS := -Wall -std=c99 $(OPTFLAGS) $(INCFLAGS) -CXXFLAGS := -Wall -Wextra -Werror -Wno-error=unused-parameter -std=c++11 $(OPTFLAGS) $(INCFLAGS) +CXXFLAGS := -Wall -Wextra -Werror -Wno-error=unused-parameter -std=c++1y $(OPTFLAGS) $(INCFLAGS) + +CXX ?= c++ LDFLAGS := $(VAMPSDK_DIR)/libvamp-hostsdk.a -L/usr/local/lib -lcapnp -lkj @@ -24,17 +26,17 @@ mkdir bin bin/piper-convert: vamp-server/convert.o $(COMMON_OBJS) - c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) bin/piper-vamp-simple-server: vamp-server/simple-server.o $(COMMON_OBJS) - c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) bin/test-suite: $(TEST_OBJS) - c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) bin/test-suite vamp-capnp/piper.capnp.o: vamp-capnp/piper.capnp.c++ - c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ vamp-capnp/piper.capnp.c++: vamp-capnp/piper.capnp.h