From 419d6b8fd02a149dd9f05b3ffbf4a7676e6e8b34 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 3 Jun 2014 18:28:36 +0200 Subject: Support for VC12 (2013), initial work --- boost/mysql/boost-mysql-vc12.sln | 17 ++ boost/mysql/date-time/makefile | 5 +- boost/mysql/makefile | 4 +- boost/mysql/template/makefile | 5 +- boost/mysql/template/template-vc12.vcxproj | 188 +++++++++++++++++++++ boost/mysql/template/template-vc12.vcxproj.filters | 25 +++ 6 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 boost/mysql/boost-mysql-vc12.sln create mode 100644 boost/mysql/template/template-vc12.vcxproj create mode 100644 boost/mysql/template/template-vc12.vcxproj.filters (limited to 'boost/mysql') diff --git a/boost/mysql/boost-mysql-vc12.sln b/boost/mysql/boost-mysql-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/boost/mysql/boost-mysql-vc12.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile index 7bfe910..b3f25b8 100644 --- a/boost/mysql/date-time/makefile +++ b/boost/mysql/date-time/makefile @@ -62,7 +62,8 @@ $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mysql/,,$(src_base $(dist): export extra_dist := $(data_dist) \ $(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters +$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ +$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) @@ -70,6 +71,7 @@ $(dist): $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) + $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) # Test. # @@ -102,6 +104,7 @@ $(call include,$(bld_root)/meta/vc8proj.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mysql/makefile b/boost/mysql/makefile index e469c81..57f65f5 100644 --- a/boost/mysql/makefile +++ b/boost/mysql/makefile @@ -13,13 +13,14 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := boost-mysql $(dist): export dirs := $(tests) $(dist): export extra_dist := $(name)-vc8.sln $(name)-vc9.sln \ -$(name)-vc10.sln $(name)-vc11.sln test.bat +$(name)-vc10.sln $(name)-vc11.sln $(name)-vc12.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc8sln,$(name)-vc8.sln) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) $(call meta-vc11sln,$(name)-vc11.sln) + $(call meta-vc12sln,$(name)-vc12.sln) $(call meta-vctest,$(name)-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) @@ -29,6 +30,7 @@ $(call include,$(bld_root)/meta/vc8sln.make) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) $(call include,$(bld_root)/meta/vc11sln.make) +$(call include,$(bld_root)/meta/vc12sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/mysql/template/makefile b/boost/mysql/template/makefile index 18d7f7a..5c2669a 100644 --- a/boost/mysql/template/makefile +++ b/boost/mysql/template/makefile @@ -58,7 +58,8 @@ $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mysql/,,$(src_base $(dist): export extra_dist := $(data_dist) \ $(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters +$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ +$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) @@ -66,6 +67,7 @@ $(dist): $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) + $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) # Test. # @@ -98,6 +100,7 @@ $(call include,$(bld_root)/meta/vc8proj.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) $(call include,$(bld_root)/meta/vc11proj.make) +$(call include,$(bld_root)/meta/vc12proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mysql/template/template-vc12.vcxproj b/boost/mysql/template/template-vc12.vcxproj new file mode 100644 index 0000000..d1c9c5a --- /dev/null +++ b/boost/mysql/template/template-vc12.vcxproj @@ -0,0 +1,188 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v120 + Unicode + + + Application + true + v120 + Unicode + + + Application + false + v120 + true + Unicode + + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + +__ifelse__(__value__(odb_options),,, +m4_dnl + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + ) + +__ifelse__(__value__(odb_options),,, +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx)) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + + + + diff --git a/boost/mysql/template/template-vc12.vcxproj.filters b/boost/mysql/template/template-vc12.vcxproj.filters new file mode 100644 index 0000000..8ac18a3 --- /dev/null +++ b/boost/mysql/template/template-vc12.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__ifelse__(__value__(odb_options),,, +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx)) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__source_filter_entries__(extra_sources) + + \ No newline at end of file -- cgit v1.1