diff options
| author | cbdev <cb@cbcdn.com> | 2022-04-28 20:41:19 +0200 |
|---|---|---|
| committer | cbdev <cb@cbcdn.com> | 2022-04-28 20:41:19 +0200 |
| commit | 811592c8190d12c6c7affa5772db3be30ba941e9 (patch) | |
| tree | 82f7cf8e21b19221ee6afcc212a2dd459c5ce244 | |
| parent | e7e23f4b15c07c25ba942cd793f9e061db6af4ea (diff) | |
| parent | d0d9699bdb9a3a6ca8109e36ba76847fd9fdebd3 (diff) | |
| download | midimonster-811592c8190d12c6c7affa5772db3be30ba941e9.tar.gz midimonster-811592c8190d12c6c7affa5772db3be30ba941e9.tar.bz2 midimonster-811592c8190d12c6c7affa5772db3be30ba941e9.zip | |
Merge branch 'master' of ssh://github.com/cbdevnet/midimonster
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | backends/Makefile | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -101,7 +101,7 @@ install: install -m 0644 configs/* "$(DESTDIR)$(EXAMPLES)" ifdef DEFAULT_CFG # Only install the default configuration if it is not already present to avoid overwriting it -ifeq (,$(wildcard $(DEFAULT_CFG))) +ifeq (,$(wildcard $(DESTDIR)$(DEFAULT_CFG))) install -Dm 0644 monster.cfg "$(DESTDIR)$(DEFAULT_CFG)" endif endif 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) |