# HG changeset patch # User Chris Cannam # Date 1539430373 -3600 # Node ID febeaa54bd81fac63aa4f3f8f4fea5124f7aed9f # Parent 234f89708d75b9ebf2b1f544e17ea2e10f99f5f7 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) diff -r 234f89708d75 -r febeaa54bd81 Makefile --- 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