aboutsummaryrefslogtreecommitdiff
path: root/evolution
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-06-03 18:28:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-06-03 18:28:36 +0200
commit419d6b8fd02a149dd9f05b3ffbf4a7676e6e8b34 (patch)
tree1ceccccbc0994e0f9151bac674604ba6c7103334 /evolution
parent8253d9fdd049a87cd34c65b6d1a643bb091479a4 (diff)
Support for VC12 (2013), initial work
Diffstat (limited to 'evolution')
-rw-r--r--evolution/add-column/makefile5
-rw-r--r--evolution/add-foreign-key/makefile5
-rw-r--r--evolution/add-index/makefile5
-rw-r--r--evolution/add-table/makefile5
-rw-r--r--evolution/alter-column/makefile5
-rw-r--r--evolution/combined/makefile5
-rw-r--r--evolution/data/makefile5
-rw-r--r--evolution/drop-column/makefile5
-rw-r--r--evolution/drop-foreign-key/makefile5
-rw-r--r--evolution/drop-index/makefile5
-rw-r--r--evolution/drop-table/makefile5
-rw-r--r--evolution/embedded/makefile5
-rw-r--r--evolution/evolution-vc12.sln17
-rw-r--r--evolution/makefile4
-rw-r--r--evolution/soft-add/makefile5
-rw-r--r--evolution/soft-delete/makefile5
-rw-r--r--evolution/template/makefile5
-rw-r--r--evolution/template/template-vc12.vcxproj204
-rw-r--r--evolution/template/template-vc12.vcxproj.filters32
-rw-r--r--evolution/version/makefile5
20 files changed, 320 insertions, 17 deletions
diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
index 0914c44..ad580b8 100644
--- a/evolution/add-column/makefile
+++ b/evolution/add-column/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index 63ac218..6f72614 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -72,7 +72,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -80,6 +81,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -127,6 +129,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/evolution/add-index/makefile b/evolution/add-index/makefile
index 61b0899..8ddb2e4 100644
--- a/evolution/add-index/makefile
+++ b/evolution/add-index/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/add-table/makefile b/evolution/add-table/makefile
index b28f057..9178b3c 100644
--- a/evolution/add-table/makefile
+++ b/evolution/add-table/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/alter-column/makefile b/evolution/alter-column/makefile
index 8884fe9..076de38 100644
--- a/evolution/alter-column/makefile
+++ b/evolution/alter-column/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/combined/makefile b/evolution/combined/makefile
index 6bf3512..54ce175 100644
--- a/evolution/combined/makefile
+++ b/evolution/combined/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/data/makefile b/evolution/data/makefile
index 08c0772..63462f7 100644
--- a/evolution/data/makefile
+++ b/evolution/data/makefile
@@ -69,7 +69,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -77,6 +78,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -123,6 +125,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/evolution/drop-column/makefile b/evolution/drop-column/makefile
index 8f8d56d..0a81973 100644
--- a/evolution/drop-column/makefile
+++ b/evolution/drop-column/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
index cfd573d..ea3d415 100644
--- a/evolution/drop-foreign-key/makefile
+++ b/evolution/drop-foreign-key/makefile
@@ -72,7 +72,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -80,6 +81,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -127,6 +129,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/evolution/drop-index/makefile b/evolution/drop-index/makefile
index b329e16..229090f 100644
--- a/evolution/drop-index/makefile
+++ b/evolution/drop-index/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/drop-table/makefile b/evolution/drop-table/makefile
index d0d97ec..202a82f 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/embedded/makefile b/evolution/embedded/makefile
index b88f7b6..ded0848 100644
--- a/evolution/embedded/makefile
+++ b/evolution/embedded/makefile
@@ -69,7 +69,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -77,6 +78,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -115,6 +117,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/evolution/evolution-vc12.sln b/evolution/evolution-vc12.sln
new file mode 100644
index 0000000..446d701
--- /dev/null
+++ b/evolution/evolution-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/evolution/makefile b/evolution/makefile
index bbe0650..1272091 100644
--- a/evolution/makefile
+++ b/evolution/makefile
@@ -34,7 +34,7 @@ $(dist): exec_dist := tester.in
$(dist): export dirs := $(filter-out $(no_dist_tests),$(tests))
$(dist): export extra_dist := $(data_dist) $(exec_dist) test.bat \
$(call vc8slns,$(name)) $(call vc9slns,$(name)) $(call vc10slns,$(name)) \
-$(call vc11slns,$(name))
+$(call vc11slns,$(name)) $(call vc12slns,$(name))
$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
$(call dist-data,$(data_dist))
$(call dist-exec,$(exec_dist))
@@ -43,6 +43,7 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
$(call meta-vc9slns,$(name))
$(call meta-vc10slns,$(name))
$(call meta-vc11slns,$(name))
+ $(call meta-vc12slns,$(name))
$(call meta-vctest,$(name)-mysql-vc10.sln,test.bat)
$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests)))
@@ -53,6 +54,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/evolution/soft-add/makefile b/evolution/soft-add/makefile
index 11a37ef..7accdc0 100644
--- a/evolution/soft-add/makefile
+++ b/evolution/soft-add/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/soft-delete/makefile b/evolution/soft-delete/makefile
index 657191b..5245f12 100644
--- a/evolution/soft-delete/makefile
+++ b/evolution/soft-delete/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/template/makefile b/evolution/template/makefile
index 92b2ba7..125201a 100644
--- a/evolution/template/makefile
+++ b/evolution/template/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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/evolution/template/template-vc12.vcxproj b/evolution/template/template-vc12.vcxproj
new file mode 100644
index 0000000..9562323
--- /dev/null
+++ b/evolution/template/template-vc12.vcxproj
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.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>v120</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v120</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v120</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v120</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>
+ <SDLCheck>true</SDLCheck>
+ </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>
+ <SDLCheck>true</SDLCheck>
+ </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>
+ <SDLCheck>true</SDLCheck>
+ </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>
+ <SDLCheck>true</SDLCheck>
+ </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>
+ <ItemGroup>
+__custom_build_entry__(
+test1.hxx,
+odb test1.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options1) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 __upcase__(-Ddatabase_)__upcase__(__value__(database)) -I$(SolutionDir)\..\libcommon)) test1.hxx,
+test1-odb.hxx;test1-odb.ixx;test1-odb.cxx;test1.sql;model.xml,
+model.hxx)
+__custom_build_entry__(
+test2.hxx,
+odb test2.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options2) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 __upcase__(-Ddatabase_)__upcase__(__value__(database)) -I$(SolutionDir)\..\libcommon)) test2.hxx,
+test2-odb.hxx;test2-odb.ixx;test2-odb.cxx;test2.sql;model.xml,
+test1-odb.hxx;model.hxx)
+__custom_build_entry__(
+test3.hxx,
+odb test3.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options3) --changelog model.xml -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1700 __upcase__(-Ddatabase_)__upcase__(__value__(database)) -I$(SolutionDir)\..\libcommon)) test3.hxx,
+test3-odb.hxx;test3-odb.ixx;test3-odb.cxx;test3.sql;test3-002-pre.sql;test3-002-post.sql;test3-003-pre.sql;test3-003-post.sql,
+test2-odb.hxx;model.hxx)
+ </ItemGroup>
+ <ItemGroup>
+__header_entry__(test1-odb.hxx)
+__header_entry__(test1-odb.ixx)
+__header_entry__(test2-odb.hxx)
+__header_entry__(test2-odb.ixx)
+__header_entry__(test3-odb.hxx)
+__header_entry__(test3-odb.ixx)
+__header_entries__(extra_headers)
+ </ItemGroup>
+ <ItemGroup>
+__source_entry__(driver.cxx)
+__source_entry__(test1-odb.cxx)
+__source_entry__(test2-odb.cxx)
+__source_entry__(test3-odb.cxx)
+__source_entries__(extra_sources)
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/evolution/template/template-vc12.vcxproj.filters b/evolution/template/template-vc12.vcxproj.filters
new file mode 100644
index 0000000..d6ac66e
--- /dev/null
+++ b/evolution/template/template-vc12.vcxproj.filters
@@ -0,0 +1,32 @@
+<?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>
+__header_filter_entry__(test1.hxx)
+__header_filter_entry__(test1-odb.hxx)
+__header_filter_entry__(test1-odb.ixx)
+__header_filter_entry__(test2.hxx)
+__header_filter_entry__(test2-odb.hxx)
+__header_filter_entry__(test2-odb.ixx)
+__header_filter_entry__(test3.hxx)
+__header_filter_entry__(test3-odb.hxx)
+__header_filter_entry__(test3-odb.ixx)
+__header_filter_entries__(extra_headers)
+ </ItemGroup>
+ <ItemGroup>
+__source_filter_entry__(driver.cxx)
+__source_filter_entry__(test1-odb.cxx)
+__source_filter_entry__(test2-odb.cxx)
+__source_filter_entry__(test3-odb.cxx)
+__source_filter_entries__(extra_sources)
+ </ItemGroup>
+</Project>
diff --git a/evolution/version/makefile b/evolution/version/makefile
index 1b20f52..ffeebdf 100644
--- a/evolution/version/makefile
+++ b/evolution/version/makefile
@@ -71,7 +71,8 @@ $(dist): headers := $(odb_hdr)
$(dist): export extra_headers := model.hxx
$(dist): export name := $(name)
$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) $(extra_headers))
$(call meta-automake,../template/Makefile.am)
@@ -79,6 +80,7 @@ $(dist):
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))
$(call meta-vc11projs,../template/template,$(name))
+ $(call meta-vc12projs,../template/template,$(name))
# Test.
#
@@ -126,6 +128,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