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 --- 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 ++++++ 7 files changed, 471 insertions(+), 5 deletions(-) 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 (limited to 'qt') 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) + + -- cgit v1.1