summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-05-15 10:00:38 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-05-15 10:00:38 +0200
commit515b45636a232da39e9cd9bbe1f451819b849b8f (patch)
tree2a6fc6650e9cd81755af0792203baf8130e46547
parentaf7149c2a2ad58f3fb1508ed3da6a4b4223f9b6f (diff)
Start using C++-11.
-rw-r--r--configure.ac4
-rw-r--r--plugingui/plugingui.cc4
-rw-r--r--vst/Makefile.mingw32.in2
3 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 02027da..7dec472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,10 @@ AM_INIT_AUTOMAKE
AC_PROG_CXX
AM_PROG_CC_C_O
+dnl Compile with C++11 support.
+#AX_CXX_COMPILE_STDCXX_11
+CXXFLAGS="$CXXFLAGS -std=c++11"
+
LT_INIT
AC_CONFIG_HEADERS(config.h)
diff --git a/plugingui/plugingui.cc b/plugingui/plugingui.cc
index 5408334..60a75fc 100644
--- a/plugingui/plugingui.cc
+++ b/plugingui/plugingui.cc
@@ -311,7 +311,7 @@ void PluginGUI::init()
(void*)&closing);
window->setFixedSize(370, 330);
- window->setCaption("DrumGizmo v"VERSION);
+ window->setCaption("DrumGizmo v" VERSION);
GUI::Label *lbl_title = new GUI::Label(window);
lbl_title->setText("DrumGizmo");
@@ -437,7 +437,7 @@ void PluginGUI::init()
l2->resize(window->width() - 40, 2);
GUI::Label *lbl_version = new GUI::Label(window);
- lbl_version->setText(".::. v"VERSION" .::. http://www.drumgizmo.org .::. GPLv3 .::.");
+ lbl_version->setText(".::. v" VERSION " .::. http://www.drumgizmo.org .::. GPLv3 .::.");
lbl_version->move(16, 300);
lbl_version->resize(window->width(), 20);
/*
diff --git a/vst/Makefile.mingw32.in b/vst/Makefile.mingw32.in
index 66e02ed..a5c8c31 100644
--- a/vst/Makefile.mingw32.in
+++ b/vst/Makefile.mingw32.in
@@ -137,7 +137,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