From 9fda153cc21db0c4bbb00265cb9acff902f5b791 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 3 Jun 2014 18:28:35 +0200 Subject: Support for VC12 (2013), initial work --- access/makefile | 5 +- boost/boost-vc12.sln | 17 +++ boost/boost-vc12.vcxproj | 182 +++++++++++++++++++++++++++++++++ boost/boost-vc12.vcxproj.filters | 25 +++++ boost/makefile | 8 +- build/bootstrap.make | 15 +++ c++11/makefile | 4 +- composite/makefile | 5 +- container/makefile | 5 +- examples-vc12.sln | 17 +++ hello/makefile | 5 +- inheritance/polymorphism/makefile | 5 +- inheritance/reuse/makefile | 5 +- inverse/makefile | 5 +- makefile | 4 +- mapping/makefile | 5 +- optimistic/makefile | 5 +- pimpl/makefile | 5 +- prepared/makefile | 5 +- qt/makefile | 28 ++++- qt/qt4-vc12.sln | 17 +++ qt/qt4-vc12.vcxproj | 182 +++++++++++++++++++++++++++++++++ qt/qt4-vc12.vcxproj.filters | 25 +++++ qt/qt5-vc12.sln | 17 +++ qt/qt5-vc12.vcxproj | 182 +++++++++++++++++++++++++++++++++ qt/qt5-vc12.vcxproj.filters | 25 +++++ query/makefile | 5 +- relationship/makefile | 5 +- schema/custom/makefile | 5 +- schema/embedded/makefile | 5 +- section/makefile | 5 +- template/makefile | 5 +- template/template-vc12.vcxproj | 182 +++++++++++++++++++++++++++++++++ template/template-vc12.vcxproj.filters | 25 +++++ view/makefile | 5 +- 35 files changed, 1018 insertions(+), 27 deletions(-) create mode 100644 boost/boost-vc12.sln create mode 100644 boost/boost-vc12.vcxproj create mode 100644 boost/boost-vc12.vcxproj.filters create mode 100644 examples-vc12.sln create mode 100644 qt/qt4-vc12.sln create mode 100644 qt/qt4-vc12.vcxproj create mode 100644 qt/qt4-vc12.vcxproj.filters create mode 100644 qt/qt5-vc12.sln create mode 100644 qt/qt5-vc12.vcxproj create mode 100644 qt/qt5-vc12.vcxproj.filters create mode 100644 template/template-vc12.vcxproj create mode 100644 template/template-vc12.vcxproj.filters diff --git a/access/makefile b/access/makefile index f401589..bfc9548 100644 --- a/access/makefile +++ b/access/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/boost-vc12.sln b/boost/boost-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/boost/boost-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/boost-vc12.vcxproj b/boost/boost-vc12.vcxproj new file mode 100644 index 0000000..db230a3 --- /dev/null +++ b/boost/boost-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + 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;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__custom_build_entry__( +__path__(odb_header_stem).hxx, +odb __path__(odb_header_stem).hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, +__path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) + + +__header_entry__(__path__(odb_header_stem)-odb.hxx) +__header_entry__(__path__(odb_header_stem)-odb.ixx) +__header_entry__(database.hxx) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entry__(__path__(odb_header_stem)-odb.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/boost/boost-vc12.vcxproj.filters b/boost/boost-vc12.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/boost/boost-vc12.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entry__(__path__(odb_header_stem).hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.ixx) +__header_filter_entries__(database.hxx) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entry__(__path__(odb_header_stem)-odb.cxx) +__source_filter_entries__(extra_sources) + + diff --git a/boost/makefile b/boost/makefile index 1f5fcfa..e8f7b41 100644 --- a/boost/makefile +++ b/boost/makefile @@ -82,9 +82,9 @@ $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README \ $(call vc8projs,$(name)) $(call vc9projs,$(name)) $(call vc10projs,$(name)) \ -$(call vc11projs,$(name)) \ +$(call vc11projs,$(name)) $(call vc12projs,$(name)) \ $(call vc8slns,$(name)) $(call vc9slns,$(name)) $(call vc10slns,$(name)) \ -$(call vc11slns,$(name)) +$(call vc11slns,$(name)) $(call vc12slns,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -92,10 +92,12 @@ $(dist): $(call meta-vc9projs,$(name),$(name)) $(call meta-vc10projs,$(name),$(name)) $(call meta-vc11projs,$(name),$(name)) + $(call meta-vc12projs,$(name),$(name)) $(call meta-vc8slns,$(name)) $(call meta-vc9slns,$(name)) $(call meta-vc10slns,$(name)) $(call meta-vc11slns,$(name)) + $(call meta-vc12slns,$(name)) # Test. # @@ -130,10 +132,12 @@ $(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/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/build/bootstrap.make b/build/bootstrap.make index 68cef06..31b3ee5 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -89,6 +89,12 @@ $(foreach d,$(databases),$(call \ meta-vc11proj,$1-vc11.vcxproj,$(if $2,$2,$(notdir \ $1))-$d-vc11.vcxproj,database,$d)$(literal_newline)$(literal_tab))@: +$(dist): meta-vc12projs = \ +$(foreach d,$(databases),$(call \ +meta-vc12proj,$1-vc12.vcxproj,$(if $2,$2,$(notdir \ +$1))-$d-vc12.vcxproj,database,$d)$(literal_newline)$(literal_tab))@: + + # $1 project name without the -vcN.vc[x]proj suffix. # vc8projs = $(addprefix $1-,$(addsuffix -vc8.vcproj,$(databases))) @@ -101,6 +107,9 @@ $(addprefix $1-,$(addsuffix -vc10.vcxproj.filters,$(databases))) vc11projs = $(addprefix $1-,$(addsuffix -vc11.vcxproj,$(databases))) \ $(addprefix $1-,$(addsuffix -vc11.vcxproj.filters,$(databases))) +vc12projs = $(addprefix $1-,$(addsuffix -vc12.vcxproj,$(databases))) \ +$(addprefix $1-,$(addsuffix -vc12.vcxproj.filters,$(databases))) + # $1 solution name without the -vcN.sln suffix. # $2 extra project suffix in addition to --vcN.vcproj (optional) # @@ -124,10 +133,16 @@ $(foreach d,$(databases),$(call \ meta-vc11sln,$1-vc11.sln,$1-$d-vc11.sln,$2-$d-vc11.vcxproj,database,$d)$(literal_newline)\ $(literal_tab))@: +$(dist): meta-vc12slns = \ +$(foreach d,$(databases),$(call \ +meta-vc12sln,$1-vc12.sln,$1-$d-vc12.sln,$2-$d-vc12.vcxproj,database,$d)$(literal_newline)\ +$(literal_tab))@: + vc8slns = $(addprefix $1-,$(addsuffix -vc8.sln,$(databases))) vc9slns = $(addprefix $1-,$(addsuffix -vc9.sln,$(databases))) vc10slns = $(addprefix $1-,$(addsuffix -vc10.sln,$(databases))) vc11slns = $(addprefix $1-,$(addsuffix -vc11.sln,$(databases))) +vc12slns = $(addprefix $1-,$(addsuffix -vc12.sln,$(databases))) endif diff --git a/c++11/makefile b/c++11/makefile index c2c59ab..1b2d072 100644 --- a/c++11/makefile +++ b/c++11/makefile @@ -86,12 +86,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc10projs,$(name)) \ -$(call vc11projs,$(name)) +$(call vc11projs,$(name)) $(call vc12projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(call meta-automake,../template/Makefile.am) $(call meta-vc10projs,../template/template,$(name)) $(call meta-vc11projs,../template/template,$(name)) + $(call meta-vc12projs,../template/template,$(name)) # Test. # @@ -124,6 +125,7 @@ endif $(call include,$(bld_root)/dist.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/composite/makefile b/composite/makefile index bbb3855..bc6b63d 100644 --- a/composite/makefile +++ b/composite/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/container/makefile b/container/makefile index bd4ebe0..a9ad7cd 100644 --- a/container/makefile +++ b/container/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/examples-vc12.sln b/examples-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/examples-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/hello/makefile b/hello/makefile index f764850..7a0863c 100644 --- a/hello/makefile +++ b/hello/makefile @@ -66,7 +66,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -74,6 +75,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. # @@ -108,6 +110,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/inheritance/polymorphism/makefile b/inheritance/polymorphism/makefile index 4daa3cb..b2c1814 100644 --- a/inheritance/polymorphism/makefile +++ b/inheritance/polymorphism/makefile @@ -68,7 +68,8 @@ $(dist): export name := $(name) $(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../../template/Makefile.am) @@ -76,6 +77,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. # @@ -110,6 +112,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/inheritance/reuse/makefile b/inheritance/reuse/makefile index caddd24..29b9b35 100644 --- a/inheritance/reuse/makefile +++ b/inheritance/reuse/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/inverse/makefile b/inverse/makefile index 683e5e0..c644c7f 100644 --- a/inverse/makefile +++ b/inverse/makefile @@ -68,7 +68,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -76,6 +77,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. # @@ -110,6 +112,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/makefile b/makefile index fb9aa3f..7e3ed4c 100644 --- a/makefile +++ b/makefile @@ -57,7 +57,7 @@ mssql-driver.bat mssql.options $(dist): exec_dist := bootstrap tester.in $(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): export version = $(shell cat $(src_root)/version) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dist_dirs))) @@ -70,6 +70,7 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dist_dirs))) $(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_dirs))) @@ -80,6 +81,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) $(call include,$(bld_root)/meta/autoconf.make) diff --git a/mapping/makefile b/mapping/makefile index 1db6ccc..1a4caff 100644 --- a/mapping/makefile +++ b/mapping/makefile @@ -68,7 +68,8 @@ $(dist): export name := $(name) $(dist): export extra_headers := traits.hxx $(databases:%=traits-%.hxx) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) \ README database.hxx) @@ -77,6 +78,7 @@ README database.hxx) $(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. # @@ -111,6 +113,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/optimistic/makefile b/optimistic/makefile index 78768af..f4a8f44 100644 --- a/optimistic/makefile +++ b/optimistic/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/pimpl/makefile b/pimpl/makefile index 47aadab..cff4996 100644 --- a/pimpl/makefile +++ b/pimpl/makefile @@ -68,7 +68,8 @@ $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -76,6 +77,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. # @@ -110,6 +112,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/prepared/makefile b/prepared/makefile index c202a48..c3b1efd 100644 --- a/prepared/makefile +++ b/prepared/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/qt/makefile b/qt/makefile index 9bcd702..35447f8 100644 --- a/qt/makefile +++ b/qt/makefile @@ -76,12 +76,24 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README \ -$(call vc8projs,$(name)4) $(call vc9projs,$(name)4) $(call vc10projs,$(name)4) \ +$(call vc8projs,$(name)4) \ +$(call vc9projs,$(name)4) \ +$(call vc10projs,$(name)4) \ $(call vc11projs,$(name)4) \ -$(call vc9projs,$(name)5) $(call vc10projs,$(name)5) $(call vc11projs,$(name)5) \ -$(call vc8slns,$(name)4) $(call vc9slns,$(name)4) $(call vc10slns,$(name)4) \ -$(call vc11slns,$(name)4) \ -$(call vc9slns,$(name)5) $(call vc10slns,$(name)5) $(call vc11slns,$(name)5) +$(call vc12projs,$(name)4) \ +$(call vc9projs,$(name)5) \ +$(call vc10projs,$(name)5) \ +$(call vc11projs,$(name)5) \ +$(call vc12projs,$(name)5) \ +$(call vc8slns,$(name)4) \ +$(call vc9slns,$(name)4) \ +$(call vc10slns,$(name)4) \ +$(call vc11slns,$(name)4) \ +$(call vc12slns,$(name)4) \ +$(call vc9slns,$(name)5) \ +$(call vc10slns,$(name)5) \ +$(call vc11slns,$(name)5) \ +$(call vc12slns,$(name)5) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -92,6 +104,8 @@ $(dist): $(call meta-vc10projs,$(name)5,$(name)5) $(call meta-vc11projs,$(name)4,$(name)4) $(call meta-vc11projs,$(name)5,$(name)5) + $(call meta-vc12projs,$(name)4,$(name)4) + $(call meta-vc12projs,$(name)5,$(name)5) $(call meta-vc8slns,$(name)4,4) $(call meta-vc9slns,$(name)4,4) $(call meta-vc9slns,$(name)5,5) @@ -99,6 +113,8 @@ $(dist): $(call meta-vc10slns,$(name)5,5) $(call meta-vc11slns,$(name)4,4) $(call meta-vc11slns,$(name)5,5) + $(call meta-vc12slns,$(name)4,4) + $(call meta-vc12slns,$(name)5,5) # Test. # @@ -133,10 +149,12 @@ $(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/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/qt/qt4-vc12.sln b/qt/qt4-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/qt/qt4-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/qt/qt4-vc12.vcxproj b/qt/qt4-vc12.vcxproj new file mode 100644 index 0000000..a01cf8d --- /dev/null +++ b/qt/qt4-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + 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;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-qt-d.lib;odb-d.lib;QtCored4.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-qt-d.lib;odb-d.lib;QtCored4.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb-qt.lib;odb.lib;QtCore4.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb-qt.lib;odb.lib;QtCore4.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__custom_build_entry__( +__path__(odb_header_stem).hxx, +odb __path__(odb_header_stem).hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, +__path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) + + +__header_entry__(__path__(odb_header_stem)-odb.hxx) +__header_entry__(__path__(odb_header_stem)-odb.ixx) +__header_entry__(database.hxx) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entry__(__path__(odb_header_stem)-odb.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/qt/qt4-vc12.vcxproj.filters b/qt/qt4-vc12.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/qt/qt4-vc12.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entry__(__path__(odb_header_stem).hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.ixx) +__header_filter_entries__(database.hxx) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entry__(__path__(odb_header_stem)-odb.cxx) +__source_filter_entries__(extra_sources) + + diff --git a/qt/qt5-vc12.sln b/qt/qt5-vc12.sln new file mode 100644 index 0000000..446d701 --- /dev/null +++ b/qt/qt5-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/qt/qt5-vc12.vcxproj b/qt/qt5-vc12.vcxproj new file mode 100644 index 0000000..f5839bb --- /dev/null +++ b/qt/qt5-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + 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;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-qt-d.lib;odb-d.lib;Qt5Cored.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-qt-d.lib;odb-d.lib;Qt5Cored.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb-qt.lib;odb.lib;Qt5Core.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb-qt.lib;odb.lib;Qt5Core.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__custom_build_entry__( +__path__(odb_header_stem).hxx, +odb __path__(odb_header_stem).hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, +__path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) + + +__header_entry__(__path__(odb_header_stem)-odb.hxx) +__header_entry__(__path__(odb_header_stem)-odb.ixx) +__header_entry__(database.hxx) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entry__(__path__(odb_header_stem)-odb.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/qt/qt5-vc12.vcxproj.filters b/qt/qt5-vc12.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/qt/qt5-vc12.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entry__(__path__(odb_header_stem).hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.ixx) +__header_filter_entries__(database.hxx) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entry__(__path__(odb_header_stem)-odb.cxx) +__source_filter_entries__(extra_sources) + + diff --git a/query/makefile b/query/makefile index 75ab428..359a763 100644 --- a/query/makefile +++ b/query/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/relationship/makefile b/relationship/makefile index 9929801..b9ce59a 100644 --- a/relationship/makefile +++ b/relationship/makefile @@ -68,7 +68,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -76,6 +77,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. # @@ -110,6 +112,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/schema/custom/makefile b/schema/custom/makefile index fad2f01..2b83ec0 100644 --- a/schema/custom/makefile +++ b/schema/custom/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../../template/Makefile.am) @@ -75,6 +76,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. # @@ -107,6 +109,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/schema/embedded/makefile b/schema/embedded/makefile index d333fa0..e9a2678 100644 --- a/schema/embedded/makefile +++ b/schema/embedded/makefile @@ -68,7 +68,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../../template/Makefile.am) @@ -76,6 +77,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. # @@ -108,6 +110,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/section/makefile b/section/makefile index abbb9c9..54d4109 100644 --- a/section/makefile +++ b/section/makefile @@ -66,7 +66,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -74,6 +75,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. # @@ -108,6 +110,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/template/makefile b/template/makefile index c299e1d..d523611 100644 --- a/template/makefile +++ b/template/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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/template/template-vc12.vcxproj b/template/template-vc12.vcxproj new file mode 100644 index 0000000..da21d1c --- /dev/null +++ b/template/template-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + 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;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;__upcase__(database_)__upcase__(__value__(database));%(PreprocessorDefinitions) + 4068;4355;4800;4290;%(DisableSpecificWarnings) + true + + + odb-__value__(database).lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__custom_build_entry__( +__path__(odb_header_stem).hxx, +odb __path__(odb_header_stem).hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, +__path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) + + +__header_entry__(__path__(odb_header_stem)-odb.hxx) +__header_entry__(__path__(odb_header_stem)-odb.ixx) +__header_entry__(database.hxx) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entry__(__path__(odb_header_stem)-odb.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/template/template-vc12.vcxproj.filters b/template/template-vc12.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/template/template-vc12.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entry__(__path__(odb_header_stem).hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.hxx) +__header_filter_entry__(__path__(odb_header_stem)-odb.ixx) +__header_filter_entries__(database.hxx) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entry__(__path__(odb_header_stem)-odb.cxx) +__source_filter_entries__(extra_sources) + + diff --git a/view/makefile b/view/makefile index aab044e..cfb061a 100644 --- a/view/makefile +++ b/view/makefile @@ -67,7 +67,8 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(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) README database.hxx) $(call meta-automake,../template/Makefile.am) @@ -75,6 +76,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. # @@ -109,6 +111,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 -- cgit v1.1