From dde0bc2f465804a6a6b4eb9770fbd094cdd0fdfa Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 16 Sep 2012 13:21:50 +0200 Subject: Add support for Visual Studio 2012 --- access/makefile | 4 +- boost/boost-vc11.sln | 15 +++ boost/boost-vc11.vcxproj | 178 +++++++++++++++++++++++++++++++++ boost/boost-vc11.vcxproj.filters | 25 +++++ boost/makefile | 9 +- build/bootstrap.make | 15 +++ c++11/makefile | 6 +- composite/makefile | 4 +- container/makefile | 4 +- examples-vc11.sln | 15 +++ hello/makefile | 4 +- inheritance/polymorphism/makefile | 4 +- inheritance/reuse/makefile | 4 +- inverse/makefile | 4 +- makefile | 4 +- mapping/makefile | 4 +- optimistic/makefile | 4 +- pimpl/makefile | 4 +- qt/makefile | 9 +- qt/qt-vc11.sln | 15 +++ qt/qt-vc11.vcxproj | 178 +++++++++++++++++++++++++++++++++ qt/qt-vc11.vcxproj.filters | 25 +++++ query/makefile | 4 +- relationship/makefile | 4 +- schema/custom/makefile | 4 +- schema/embedded/makefile | 4 +- template/makefile | 4 +- template/template-vc11.vcxproj | 178 +++++++++++++++++++++++++++++++++ template/template-vc11.vcxproj.filters | 25 +++++ view/makefile | 4 +- 30 files changed, 738 insertions(+), 23 deletions(-) create mode 100644 boost/boost-vc11.sln create mode 100644 boost/boost-vc11.vcxproj create mode 100644 boost/boost-vc11.vcxproj.filters create mode 100644 examples-vc11.sln create mode 100644 qt/qt-vc11.sln create mode 100644 qt/qt-vc11.vcxproj create mode 100644 qt/qt-vc11.vcxproj.filters create mode 100644 template/template-vc11.vcxproj create mode 100644 template/template-vc11.vcxproj.filters diff --git a/access/makefile b/access/makefile index 6dbe181..cff8599 100644 --- a/access/makefile +++ b/access/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/boost/boost-vc11.sln b/boost/boost-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/boost-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/boost/boost-vc11.vcxproj b/boost/boost-vc11.vcxproj new file mode 100644 index 0000000..6a768f0 --- /dev/null +++ b/boost/boost-vc11.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + 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) + + + 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) + + + 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) + + + 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) + + + 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 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __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-vc11.vcxproj.filters b/boost/boost-vc11.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/boost/boost-vc11.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 aeb4f5f..8a314bb 100644 --- a/boost/makefile +++ b/boost/makefile @@ -78,15 +78,18 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) -$(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) $(call vc9slns,$(name)) $(call vc10slns,$(name)) +$(dist): export extra_dist := README \ +$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \ +$(call vc9slns,$(name)) $(call vc10slns,$(name)) $(call vc11slns,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,$(name),$(name)) $(call meta-vc10projs,$(name),$(name)) + $(call meta-vc11projs,$(name),$(name)) $(call meta-vc9slns,$(name)) $(call meta-vc10slns,$(name)) + $(call meta-vc11slns,$(name)) # Test. # @@ -119,8 +122,10 @@ endif $(call include,$(bld_root)/dist.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/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/build/bootstrap.make b/build/bootstrap.make index 0bb6102..2e495e1 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -79,12 +79,21 @@ $(foreach d,$(databases),$(call \ meta-vc10proj,$1-vc10.vcxproj,$(if $2,$2,$(notdir \ $1))-$d-vc10.vcxproj,database,$d)$(literal_newline)$(literal_tab))@: +$(dist): meta-vc11projs = \ +$(foreach d,$(databases),$(call \ +meta-vc11proj,$1-vc11.vcxproj,$(if $2,$2,$(notdir \ +$1))-$d-vc11.vcxproj,database,$d)$(literal_newline)$(literal_tab))@: + # $1 project name without the -vcN.vc[x]proj suffix. # vc9projs = $(addprefix $1-,$(addsuffix -vc9.vcproj,$(databases))) + vc10projs = $(addprefix $1-,$(addsuffix -vc10.vcxproj,$(databases))) \ $(addprefix $1-,$(addsuffix -vc10.vcxproj.filters,$(databases))) +vc11projs = $(addprefix $1-,$(addsuffix -vc11.vcxproj,$(databases))) \ +$(addprefix $1-,$(addsuffix -vc11.vcxproj.filters,$(databases))) + # $1 solution name without the -vcN.sln suffix. # $(dist): meta-vc9slns = \ @@ -97,8 +106,14 @@ $(foreach d,$(databases),$(call \ meta-vc10sln,$1-vc10.sln,$1-$d-vc10.sln,-$d-vc10.vcxproj,database,$d)$(literal_newline)\ $(literal_tab))@: +$(dist): meta-vc11slns = \ +$(foreach d,$(databases),$(call \ +meta-vc11sln,$1-vc11.sln,$1-$d-vc11.sln,-$d-vc11.vcxproj,database,$d)$(literal_newline)\ +$(literal_tab))@: + vc9slns = $(addprefix $1-,$(addsuffix -vc9.sln,$(databases))) vc10slns = $(addprefix $1-,$(addsuffix -vc10.sln,$(databases))) +vc11slns = $(addprefix $1-,$(addsuffix -vc11.sln,$(databases))) endif diff --git a/c++11/makefile b/c++11/makefile index ae5ff89..3cd2b3b 100644 --- a/c++11/makefile +++ b/c++11/makefile @@ -84,11 +84,13 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) -$(dist): export extra_dist := README $(call vc10projs,$(name)) +$(dist): export extra_dist := README $(call vc10projs,$(name)) \ +$(call vc11projs,$(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)) # Test. # @@ -119,8 +121,8 @@ endif # How to. # $(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc10sln.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/composite/makefile b/composite/makefile index 40f72cf..a2249b9 100644 --- a/composite/makefile +++ b/composite/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/container/makefile b/container/makefile index ab11e6a..1118e62 100644 --- a/container/makefile +++ b/container/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/examples-vc11.sln b/examples-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/examples-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/hello/makefile b/hello/makefile index 02736b1..5134ae3 100644 --- a/hello/makefile +++ b/hello/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/inheritance/polymorphism/makefile b/inheritance/polymorphism/makefile index bc30e8a..486ebb6 100644 --- a/inheritance/polymorphism/makefile +++ b/inheritance/polymorphism/makefile @@ -67,12 +67,13 @@ $(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 vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -105,6 +106,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/inheritance/reuse/makefile b/inheritance/reuse/makefile index 57a0607..d00229c 100644 --- a/inheritance/reuse/makefile +++ b/inheritance/reuse/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/inverse/makefile b/inverse/makefile index 81af551..ba8980f 100644 --- a/inverse/makefile +++ b/inverse/makefile @@ -67,12 +67,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -105,6 +106,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/makefile b/makefile index 4ffe31d..31672fb 100644 --- a/makefile +++ b/makefile @@ -54,7 +54,7 @@ pgsql-driver.bat pgsql.options oracle-driver.bat oracle.options \ mssql-driver.bat mssql.options $(dist): exec_dist := bootstrap tester $(dist): export extra_dist := $(data_dist) $(exec_dist) test.bat \ -$(call vc9slns,$(name)) $(call vc10slns,$(name)) +$(call vc9slns,$(name)) $(call vc10slns,$(name)) $(call vc11slns,$(name)) $(dist): export version = $(shell cat $(src_root)/version) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dist_dirs))) @@ -65,6 +65,7 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dist_dirs))) $(call meta-autoconf) $(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_dirs))) @@ -73,6 +74,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_dirs))) $(call include,$(bld_root)/dist.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/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 b6350a0..cee0857 100644 --- a/mapping/makefile +++ b/mapping/makefile @@ -68,13 +68,14 @@ $(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 vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(extra_headers) \ README database.hxx) $(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. # @@ -107,6 +108,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/optimistic/makefile b/optimistic/makefile index dc200e8..40b5b46 100644 --- a/optimistic/makefile +++ b/optimistic/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/pimpl/makefile b/pimpl/makefile index f209e1b..2ad4bcf 100644 --- a/pimpl/makefile +++ b/pimpl/makefile @@ -67,12 +67,13 @@ $(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 vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -105,6 +106,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/qt/makefile b/qt/makefile index d7c6fef..d4e8265 100644 --- a/qt/makefile +++ b/qt/makefile @@ -74,15 +74,18 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) -$(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) $(call vc9slns,$(name)) $(call vc10slns,$(name)) +$(dist): export extra_dist := README \ +$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \ +$(call vc9slns,$(name)) $(call vc10slns,$(name)) $(call vc11slns,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,$(name),$(name)) $(call meta-vc10projs,$(name),$(name)) + $(call meta-vc11projs,$(name),$(name)) $(call meta-vc9slns,$(name)) $(call meta-vc10slns,$(name)) + $(call meta-vc11slns,$(name)) # Test. # @@ -115,8 +118,10 @@ endif $(call include,$(bld_root)/dist.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/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/qt/qt-vc11.sln b/qt/qt-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/qt/qt-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/qt/qt-vc11.vcxproj b/qt/qt-vc11.vcxproj new file mode 100644 index 0000000..229c450 --- /dev/null +++ b/qt/qt-vc11.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + 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) + + + 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) + + + 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) + + + 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) + + + 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 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __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/qt-vc11.vcxproj.filters b/qt/qt-vc11.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/qt/qt-vc11.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 5a96b5e..19bf686 100644 --- a/query/makefile +++ b/query/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/relationship/makefile b/relationship/makefile index 3e41f1d..f3c38f9 100644 --- a/relationship/makefile +++ b/relationship/makefile @@ -67,12 +67,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -105,6 +106,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/schema/custom/makefile b/schema/custom/makefile index 44b57a5..bffb065 100644 --- a/schema/custom/makefile +++ b/schema/custom/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -102,6 +103,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/schema/embedded/makefile b/schema/embedded/makefile index 6d2b521..6c8baa5 100644 --- a/schema/embedded/makefile +++ b/schema/embedded/makefile @@ -67,12 +67,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -103,6 +104,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/template/makefile b/template/makefile index e3051bc..fe609e3 100644 --- a/template/makefile +++ b/template/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -104,6 +105,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/template/template-vc11.vcxproj b/template/template-vc11.vcxproj new file mode 100644 index 0000000..d399563 --- /dev/null +++ b/template/template-vc11.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + 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) + + + 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) + + + 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) + + + 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) + + + 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 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __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-vc11.vcxproj.filters b/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..f754d41 --- /dev/null +++ b/template/template-vc11.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 641d4cd..30927ea 100644 --- a/view/makefile +++ b/view/makefile @@ -67,12 +67,13 @@ $(dist): headers := $(odb_hdr) $(dist): export name := $(name) $(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := README $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) README database.hxx) $(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. # @@ -105,6 +106,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 -- cgit v1.1