diff --git a/TODO b/TODO
index 279dec9..36e52a9 100644
--- a/TODO
+++ b/TODO
@@ -25,3 +25,4 @@
 * error checking etc. web, especially processor.js
 * LV2: round latency output value
 * daisy-seed: DAC
+* plugin_init and plugin_set_sample_rate to return char (can fail)
diff --git a/templates/cmd-make/Makefile b/templates/cmd-make/Makefile
index fb07d3e..964c430 100644
--- a/templates/cmd-make/Makefile
+++ b/templates/cmd-make/Makefile
@@ -14,6 +14,7 @@ DATA_DIR := $(or $(DATA_DIR),.)
 PLUGIN_DIR := $(or $(PLUGIN_DIR),src)
 
 CC = gcc
+CXX = g++
 
 CFLAGS = -O3 -Wall -Wpedantic -Wextra
 CFLAGS_ALL = -I${DATA_DIR}/src -I${PLUGIN_DIR} -I${TINYWAV_DIR} -I${MIDI_PARSER_DIR}/include -fPIC ${CFLAGS} ${CFLAGS_EXTRA}
@@ -21,26 +22,32 @@ CFLAGS_ALL = -I${DATA_DIR}/src -I${PLUGIN_DIR} -I${TINYWAV_DIR} -I${MIDI_PARSER_
 LDFLAGS =
 LDFLAGS_ALL = ${LDFLAGS} ${LDFLAGS_EXTRA}
 
+CXXFLAGS = ${CFLAGS}
+CXXFLAGS_ALL = -I${DATA_DIR}/src -I${PLUGIN_DIR} -I${TINYWAV_DIR} -I${MIDI_PARSER_DIR}/include -fPIC ${CXXFLAGS} ${CXXFLAGS_EXTRA}
+
 ifeq ($(UNAME_S), Darwin)
 CFLAGS_ALL := ${CFLAGS_ALL} -arch arm64 -arch x86_64
 LDFLAGS_ALL := ${LDFLAGS_ALL} -arch arm64 -arch x86_64
+CXXFLAGS_ALL := ${CXXFLAGS_ALL} -arch arm64 -arch x86_64
 endif
 
 PROGRAM = ${BUNDLE_NAME}${EXE_SUFFIX}
 
-C_SRCS = ${COMMON_DIR}/src/main.c ${TINYWAV_DIR}/tinywav.c ${MIDI_PARSER_DIR}/src/midi-parser.c
+C_SRCS = ${COMMON_DIR}/src/main.c ${TINYWAV_DIR}/tinywav.c ${MIDI_PARSER_DIR}/src/midi-parser.c ${C_SRCS_EXTRA}
 C_OBJS = $(addprefix build/obj/, $(notdir $(C_SRCS:.c=.o)))
 
+CXX_SRCS = ${CXX_SRCS_EXTRA}
+CXX_OBJS = $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o)))
+
 all: build/${PROGRAM}
 
+ifeq ($(CXX_OBJS),)
 build/${PROGRAM}: ${C_OBJS} | build
 	${CC} $^ -o $@ ${CFLAGS_ALL} ${LDFLAGS_ALL}
-
-.SECONDEXPANSION:
-
-PERCENT := %
-$(C_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).c,$$(C_SRCS)) | build/obj
-	${CC} $^ -o $@ -c ${CFLAGS_ALL}
+else
+build/${PROGRAM}: ${C_OBJS} ${CXX_OBJS} | build
+	${CXX} $^ -o $@ ${CFLAGS_ALL} ${LDFLAGS_ALL}
+endif
 
 build build/obj:
 	mkdir -p $@
@@ -49,15 +56,22 @@ clean:
 	rm -fr build
 
 ifeq ($(OS), Windows_NT)
-
 .PHONY: all clean
-
 else
-
 install: all
 	mkdir -p -m 0755 ${BINDIR}
 	install -m 0755 build/${PROGRAM} ${BINDIR}
 
 .PHONY: all clean install
-
 endif
+
+.SECONDEXPANSION:
+
+PERCENT := %
+
+$(C_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).c,$$(C_SRCS)) | build/obj
+	${CC} $^ -o $@ -c ${CFLAGS_ALL}
+
+$(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cpp,$$(CXX_SRCS)) | build/obj
+	${CXX} $^ -o $@ -c ${CXXFLAGS_ALL}
+
diff --git a/templates/cmd-make/vars.mk b/templates/cmd-make/vars.mk
index 94518eb..35713af 100644
--- a/templates/cmd-make/vars.mk
+++ b/templates/cmd-make/vars.mk
@@ -1,8 +1,15 @@
 BUNDLE_NAME := {{=it.product.bundleName}}
+
 CFLAGS_EXTRA := {{=it.make && it.make.cflags ? it.make.cflags : ""}} {{=it.cmd_make.cflags ? it.cmd_make.cflags : ""}}
+CXXFLAGS_EXTRA := {{=it.make && it.make.cxxflags ? it.make.cxxflags : ""}} {{=it.cmd_make.cxxflags ? it.cmd_make.cxxflags : ""}}
 LDFLAGS_EXTRA := {{=it.make && it.make.ldflags ? it.make.ldflags : ""}} {{=it.cmd_make.ldflags ? it.cmd_make.ldflags : ""}}
+
+C_SRCS_EXTRA := {{=it.make && it.make.cSrcs ? it.make.cSrcs : ""}} {{=it.cmd_make.cSrcs ? it.cmd_make.cSrcs : ""}}
+CXX_SRCS_EXTRA := {{=it.make && it.make.cxxSrcs ? it.make.cxxSrcs : ""}} {{=it.cmd_make.cxxSrcs ? it.cmd_make.cxxSrcs : ""}}
+
 COMMON_DIR := {{=it.cmd_make && it.cmd_make.commonDir ? it.cmd_make.commonDir : (it.make && it.make.commonDir ? it.make.commonDir : "")}}
 DATA_DIR := {{=it.cmd_make && it.cmd_make.dataDir ? it.cmd_make.dataDir : (it.make && it.make.dataDir ? it.make.dataDir : "")}}
 PLUGIN_DIR := {{=it.cmd_make && it.cmd_make.pluginDir ? it.cmd_make.pluginDir : (it.make && it.make.pluginDir ? it.make.pluginDir : "")}}
+
 TINYWAV_DIR := {{=it.cmd_make.tinywavDir}}
 MIDI_PARSER_DIR := {{=it.cmd_make.midiParserDir}}