summaryrefslogtreecommitdiff
path: root/vst
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-05-16 08:35:39 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-05-16 08:35:39 +0200
commit0adc05286d97536637d01ed0a295d45f7bb60c1d (patch)
tree7f06e82a515d4ab47f5c944eaec98c2b43b8c146 /vst
parentc91ae2624f3d3c003c6b2065f3cc128b1b039801 (diff)
parentceda77eb38f0b0824f03348f5291e3a42d8f7306 (diff)
Merge remote-tracking branch 'origin' into diskstreaming
Conflicts: src/Makefile.am.drumgizmo src/drumgizmo.h
Diffstat (limited to 'vst')
-rw-r--r--vst/Makefile.mingw32.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/vst/Makefile.mingw32.in b/vst/Makefile.mingw32.in
index 66e02ed..54c42e0 100644
--- a/vst/Makefile.mingw32.in
+++ b/vst/Makefile.mingw32.in
@@ -12,6 +12,7 @@ DG_SRC = \
@top_srcdir@/src/channel.cc \
@top_srcdir@/src/channelmixer.cc \
@top_srcdir@/src/chresampler.cc \
+ @top_srcdir@/src/configfile.cc \
@top_srcdir@/src/configuration.cc \
@top_srcdir@/src/configparser.cc \
@top_srcdir@/src/drumgizmo.cc \
@@ -137,7 +138,7 @@ SRC = \
all:
gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c
gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c
- g++ -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) $(EXPAT_CFLAGS) $(ZLIB_CFLAGS) $(SRC_CFLAGS) $(ZITA_CXXFLAGS) $(EXPAT_LIBS) $(ZLIB_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) $(SRC_LIBS) $(ZITA_LIBS) -shared -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a
+ g++ -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) $(EXPAT_CFLAGS) $(ZLIB_CFLAGS) $(SRC_CFLAGS) $(ZITA_CXXFLAGS) $(EXPAT_LIBS) $(ZLIB_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) $(SRC_LIBS) $(ZITA_LIBS) -shared -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a
clean:
del -f drumgizmo_vst.dll libdrumgizmo_vst.a