From 34a371625b17428aa0e35488499a2a7b69b0da27 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov <boris@codesynthesis.com> Date: Fri, 2 Mar 2012 12:29:37 +0200 Subject: C++11 support in automake and VC++ projects, portability fixes --- qt/mssql/template/Makefile.am | 4 ++++ qt/mssql/template/template-vc10.vcxproj | 2 +- qt/mssql/template/template-vc9.vcproj | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'qt/mssql') diff --git a/qt/mssql/template/Makefile.am b/qt/mssql/template/Makefile.am index 33b0868..7d944cc 100644 --- a/qt/mssql/template/Makefile.am +++ b/qt/mssql/template/Makefile.am @@ -26,6 +26,10 @@ ODB = @ODB@ ODBFLAGS = @ODBFLAGS@ ODBCPPFLAGS = @ODBCPPFLAGS@ +if HAVE_CXX11 +ODBFLAGS += --std c++11 +endif + test-odb.hxx: test.hxx $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< ) diff --git a/qt/mssql/template/template-vc10.vcxproj b/qt/mssql/template/template-vc10.vcxproj index d913afc..a3477e0 100644 --- a/qt/mssql/template/template-vc10.vcxproj +++ b/qt/mssql/template/template-vc10.vcxproj @@ -160,7 +160,7 @@ m4_dnl __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup>) <ItemGroup> diff --git a/qt/mssql/template/template-vc9.vcproj b/qt/mssql/template/template-vc9.vcproj index dc38c43..dc06622 100644 --- a/qt/mssql/template/template-vc9.vcproj +++ b/qt/mssql/template/template-vc9.vcproj @@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx)) -- cgit v1.1