changeset 355:50fde8eecba5

Win32 build fixes
author Chris Cannam
date Mon, 07 Sep 2015 12:01:19 +0100
parents 63609ec70811
children 7dcff010d9cd
files .hgsubstate Makefile.mingw32
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Sep 07 12:00:22 2015 +0100
+++ b/.hgsubstate	Mon Sep 07 12:01:19 2015 +0100
@@ -1,3 +1,3 @@
 7a48704e9a0fac1486240f9f7b7e31436a588064 bqvec
-500416b7a651efa2a334ef0ee75fffde0d1f755d constant-q-cpp
+b4018913cd9b9ec5833c6003b5c0642f0353eb2f constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
--- a/Makefile.mingw32	Mon Sep 07 12:00:22 2015 +0100
+++ b/Makefile.mingw32	Mon Sep 07 12:01:19 2015 +0100
@@ -6,7 +6,8 @@
 AR		= $(TOOLPREFIX)ar
 RANLIB		= $(TOOLPREFIX)ranlib
 
-CXXFLAGS 	:= $(CXXFLAGS) -DUSE_OWN_ALIGNED_MALLOC -DNDEBUG -O3 -msse -msse2 -ffast-math -mfpmath=sse -Wall -Wextra 
+CFLAGS 		:= -DUSE_OWN_ALIGNED_MALLOC -DNDEBUG -O3 -msse -msse2 -ffast-math -mfpmath=sse -Wall -Wextra 
+CXXFLAGS 	:= $(CXXFLAGS) $(CFLAGS) -std=c++11
 PLUGIN_LDFLAGS 	:= $(LDFLAGS) -shared -static -Wl,--retain-symbols-file=vamp-plugin.list
 
 VAMPSDK_DIR 	:= ../vamp-plugin-sdk