From 1a272c393f972f6f8dc499818b90218bcc07bfb6 Mon Sep 17 00:00:00 2001 From: rekado Date: Wed, 11 Feb 2015 23:16:16 +0100 Subject: name peg file after TYPE --- Makefile | 8 ++++---- src/mdaPiano.h | 6 +++++- src/mdaPianoVoice.h | 6 +++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c46eee2..2773062 100644 --- a/Makefile +++ b/Makefile @@ -22,12 +22,12 @@ build/$(BUNDLE): src/$(TYPE)/manifest.ttl \ mkdir -p build/$(BUNDLE) cp -r $^ build/$(BUNDLE) -build/$(TYPE).so: $(SOURCES) src/ports.peg +build/$(TYPE).so: $(SOURCES) src/$(TYPE).peg mkdir -p build $(CXX) $(FLAGS) -shared $(SOURCES) `pkg-config --cflags --libs lvtk-plugin-1` -o $@ -src/ports.peg: src/$(TYPE)/$(TYPE).ttl - ttl2c $^ src/ports.peg +src/$(TYPE).peg: src/$(TYPE)/$(TYPE).ttl + ttl2c $^ src/$(TYPE).peg install: build/$(BUNDLE) mkdir -p $(INSTALL_DIR) @@ -35,4 +35,4 @@ install: build/$(BUNDLE) cp -R build/$(BUNDLE) $(INSTALL_DIR) clean: - rm -rf build src/ports.peg + rm -rf build src/*.peg diff --git a/src/mdaPiano.h b/src/mdaPiano.h index ffb26c8..134be85 100644 --- a/src/mdaPiano.h +++ b/src/mdaPiano.h @@ -3,7 +3,11 @@ //See associated .cpp file for copyright and other info #include "mdaPianoVoice.h" -#include "ports.peg" +#ifdef PIANO +#include "mdaPiano.peg" +#elif defined EPIANO +#include "mdaEPiano.peg" +#endif #pragma GCC system_header #include diff --git a/src/mdaPianoVoice.h b/src/mdaPianoVoice.h index 9de7cac..6c5c0db 100644 --- a/src/mdaPianoVoice.h +++ b/src/mdaPianoVoice.h @@ -2,7 +2,11 @@ #define MDA_PIANO_VOICE_H #include "mdaPianoCommon.h" -#include "ports.peg" +#ifdef PIANO +#include "mdaPiano.peg" +#elif defined EPIANO +#include "mdaEPiano.peg" +#endif #pragma GCC system_header #include -- cgit v1.2.3