diff options
Diffstat (limited to 'common')
42 files changed, 349 insertions, 39 deletions
diff --git a/common/access/makefile b/common/access/makefile index 3cf2953..cf167f3 100644 --- a/common/access/makefile +++ b/common/access/makefile @@ -56,12 +56,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -97,6 +98,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/auto/makefile b/common/auto/makefile index 188267e..7b9321f 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/blob/makefile b/common/blob/makefile index 5d1ac1c..cdf35f7 100644 --- a/common/blob/makefile +++ b/common/blob/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/callback/makefile b/common/callback/makefile index 0c85d05..5538707 100644 --- a/common/callback/makefile +++ b/common/callback/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/circular/multiple/makefile b/common/circular/multiple/makefile index bce0f5b..0ad17d6 100644 --- a/common/circular/multiple/makefile +++ b/common/circular/multiple/makefile @@ -60,12 +60,13 @@ $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../../template/Makefile.am) $(call meta-vc9projs,../../template/template,$(name)) $(call meta-vc10projs,../../template/template,$(name)) + $(call meta-vc11projs,../../template/template,$(name)) # Test. # @@ -100,6 +101,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/circular/single/makefile b/common/circular/single/makefile index 1fcfdb0..955a81e 100644 --- a/common/circular/single/makefile +++ b/common/circular/single/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../../template/Makefile.am) $(call meta-vc9projs,../../template/template,$(name)) $(call meta-vc10projs,../../template/template,$(name)) + $(call meta-vc11projs,../../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/common-vc11.sln b/common/common-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/common/common-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/common/composite-id/makefile b/common/composite-id/makefile index 3c91c2d..25970aa 100644 --- a/common/composite-id/makefile +++ b/common/composite-id/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/composite/makefile b/common/composite/makefile index 602a9ab..015f2b8 100644 --- a/common/composite/makefile +++ b/common/composite/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/const-member/makefile b/common/const-member/makefile index 1c22843..8c8b932 100644 --- a/common/const-member/makefile +++ b/common/const-member/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/const-object/makefile b/common/const-object/makefile index 47d9a0b..1826dbe 100644 --- a/common/const-object/makefile +++ b/common/const-object/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/container/makefile b/common/container/makefile index b81b891..7173c57 100644 --- a/common/container/makefile +++ b/common/container/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/ctor/makefile b/common/ctor/makefile index abcb78c..4b79e2c 100644 --- a/common/ctor/makefile +++ b/common/ctor/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/default/makefile b/common/default/makefile index ad2010a..653b395 100644 --- a/common/default/makefile +++ b/common/default/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/definition/makefile b/common/definition/makefile index 961685f..11b8d94 100644 --- a/common/definition/makefile +++ b/common/definition/makefile @@ -60,12 +60,13 @@ $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -101,6 +102,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/enum/makefile b/common/enum/makefile index f22da16..a69e3f0 100644 --- a/common/enum/makefile +++ b/common/enum/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/erase-query/makefile b/common/erase-query/makefile index 5fc5305..caac9cc 100644 --- a/common/erase-query/makefile +++ b/common/erase-query/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/index/makefile b/common/index/makefile index e21aab0..ddc9f11 100644 --- a/common/index/makefile +++ b/common/index/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/inheritance/makefile b/common/inheritance/makefile index 26d27eb..df31c4f 100644 --- a/common/inheritance/makefile +++ b/common/inheritance/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/inverse/makefile b/common/inverse/makefile index 8e3e912..0f17e8c 100644 --- a/common/inverse/makefile +++ b/common/inverse/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile index f0344c9..f3bcd76 100644 --- a/common/lazy-ptr/makefile +++ b/common/lazy-ptr/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile index 210bb46..0fffed1 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/makefile b/common/makefile index 9356327..3988260 100644 --- a/common/makefile +++ b/common/makefile @@ -61,11 +61,12 @@ $(dist): name := $(name) $(dist): export dirs := $(filter-out include,$(tests)) $(dist): export thread_dirs := $(thread_tests) $(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \ -$(call vc10slns,$(name)) +$(call vc10slns,$(name)) $(call vc11slns,$(name)) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) $(call meta-automake) $(call meta-vc9slns,$(name)) $(call meta-vc10slns,$(name)) + $(call meta-vc11slns,$(name)) $(call meta-vctest,$(name)-mysql-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests))) @@ -73,6 +74,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests))) $(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/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/common/no-id/makefile b/common/no-id/makefile index 9c6eeec..04f8b03 100644 --- a/common/no-id/makefile +++ b/common/no-id/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/optimistic/makefile b/common/optimistic/makefile index 80e32f5..9042931 100644 --- a/common/optimistic/makefile +++ b/common/optimistic/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/polymorphism/makefile b/common/polymorphism/makefile index 36d48ea..6a8b72a 100644 --- a/common/polymorphism/makefile +++ b/common/polymorphism/makefile @@ -57,12 +57,13 @@ $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -99,6 +100,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/pragma/makefile b/common/pragma/makefile index 09696c3..d576667 100644 --- a/common/pragma/makefile +++ b/common/pragma/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -95,6 +96,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/query/makefile b/common/query/makefile index 8d08b04..8cfbb95 100644 --- a/common/query/makefile +++ b/common/query/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/readonly/makefile b/common/readonly/makefile index 4409927..822bf0e 100644 --- a/common/readonly/makefile +++ b/common/readonly/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/relationship-query/makefile b/common/relationship-query/makefile index 87835ad..617c1dd 100644 --- a/common/relationship-query/makefile +++ b/common/relationship-query/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/relationship/makefile b/common/relationship/makefile index 4a6425e..c3b3c66 100644 --- a/common/relationship/makefile +++ b/common/relationship/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/schema/makefile b/common/schema/makefile index 9a3fb92..e7f03df 100644 --- a/common/schema/makefile +++ b/common/schema/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/session/makefile b/common/session/makefile index e9edc87..7da6d42 100644 --- a/common/session/makefile +++ b/common/session/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/template/makefile b/common/template/makefile index bf28ba1..bbb65f1 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/template/template-vc11.vcxproj b/common/template/template-vc11.vcxproj new file mode 100644 index 0000000..048f160 --- /dev/null +++ b/common/template/template-vc11.vcxproj @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{__uuid__()}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>__value__(name)</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>$(Configuration)\</OutDir> + <TargetName>driver</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <TargetName>driver</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(Configuration)\</OutDir> + <TargetName>driver</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <TargetName>driver</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> +__ifelse__(__value__(odb_options),,, +m4_dnl + <ItemGroup> + __foreach_w__(__f,__path__(odb_header_stem), + __custom_build_entry__( +__f.hxx, +odb __f.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) __f.hxx, +__f-odb.hxx;__f-odb.ixx;__f-odb.cxx) +) + </ItemGroup>) + <ItemGroup> +__ifelse__(__value__(odb_options),,, + __foreach_w__(__f,__path__(odb_header_stem), +__header_entry__(__f-odb.hxx) +__header_entry__(__f-odb.ixx) +))__header_entries__(extra_headers) + </ItemGroup> + <ItemGroup> +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,, + __foreach_w__(__f,__path__(odb_header_stem), +__source_entry__(__f-odb.cxx) +))__source_entries__(extra_sources) + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/common/template/template-vc11.vcxproj.filters b/common/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..3460ffd --- /dev/null +++ b/common/template/template-vc11.vcxproj.filters @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{__uuid__()}</UniqueIdentifier> + <Extensions>cxx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{__uuid__()}</UniqueIdentifier> + <Extensions>h;hxx;ixx;txx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> +__ifelse__(__value__(odb_options),,, + __foreach_w__(__f,__path__(odb_header_stem), +__header_filter_entry__(__f.hxx) +__header_filter_entry__(__f-odb.hxx) +__header_filter_entry__(__f-odb.ixx) +))__header_filter_entries__(extra_headers) + </ItemGroup> + <ItemGroup> +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,, + __foreach_w__(__f,__path__(odb_header_stem), +__source_filter_entry__(__f-odb.cxx) +))__source_filter_entries__(extra_sources) + </ItemGroup> +</Project> diff --git a/common/threads/makefile b/common/threads/makefile index 1c3550d..3c0a041 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/transaction/makefile b/common/transaction/makefile index aa15629..516990c 100644 --- a/common/transaction/makefile +++ b/common/transaction/makefile @@ -37,12 +37,13 @@ $(dist): sources := $(cxx_tun) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -76,6 +77,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/common/types/makefile b/common/types/makefile index f81b56f..5df5a0a 100644 --- a/common/types/makefile +++ b/common/types/makefile @@ -54,12 +54,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -94,6 +95,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/view/makefile b/common/view/makefile index 26566ce..cf389cc 100644 --- a/common/view/makefile +++ b/common/view/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/virtual/makefile b/common/virtual/makefile index 92ae1d6..a5d24f9 100644 --- a/common/virtual/makefile +++ b/common/virtual/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/common/wrapper/makefile b/common/wrapper/makefile index 101ac93..79d39d9 100644 --- a/common/wrapper/makefile +++ b/common/wrapper/makefile @@ -55,12 +55,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -96,6 +97,7 @@ endif $(call include,$(bld_root)/dist.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/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard |