From 640255dc07a24476f0c62338e7fa013e3a93dcf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20H=C3=BClsmann?= Date: Thu, 31 Mar 2022 08:23:05 +0200 Subject: =?UTF-8?q?Use=20C++11=20for=20OLA=20backend;=20rename=20CPPFLAGS?= =?UTF-8?q?=20=E2=86=92=20CXXFLAGS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backends/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'backends') diff --git a/backends/Makefile b/backends/Makefile index 35782ab..72ba776 100644 --- a/backends/Makefile +++ b/backends/Makefile @@ -18,11 +18,11 @@ SYSTEM := $(shell uname -s) # Generate debug symbols unless overridden CFLAGS ?= -g -CPPFLAGS ?= -g +CXXFLAGS ?= -g # All backends are shared libraries CFLAGS += -fPIC -I../ -Wall -Wpedantic -CPPFLAGS += -fPIC -I../ +CXXFLAGS += -fPIC -I../ LDFLAGS += -shared # Build Linux backends if possible @@ -82,7 +82,7 @@ midi.so: LDLIBS = -lasound evdev.so: CFLAGS += $(shell pkg-config --cflags libevdev || echo "-DBUILD_ERROR=\"Missing pkg-config data for libevdev\"") evdev.so: LDLIBS = $(shell pkg-config --libs libevdev || echo "-DBUILD_ERROR=\"Missing pkg-config data for libevdev\"") ola.so: LDLIBS = -lola -ola.so: CPPFLAGS += -Wno-write-strings +ola.so: CXXFLAGS += -std=c++11 -Wno-write-strings # The pkg-config name for liblua5.3 is subject to discussion. I prefer 'lua5.3' (which works on Debian and OSX), # but Arch requires 'lua53' which works on Debian, too, but breaks on OSX. @@ -108,7 +108,7 @@ python.dll: LDLIBS += -L../ -lpython3 $(CC) $(CFLAGS) $< $(ADDITIONAL_OBJS) -o $@ $(LDFLAGS) $(LDLIBS) %.so :: %.cpp %.h - $(CXX) $(CPPFLAGS) $< $(ADDITIONAL_OBJS) -o $@ $(LDFLAGS) $(LDLIBS) + $(CXX) $(CXXFLAGS) $< $(ADDITIONAL_OBJS) -o $@ $(LDFLAGS) $(LDLIBS) # This is the actual first named target, and thus the default all: $(BACKEND_LIB) $(BACKENDS) -- cgit v1.2.3