From 70cd8d0e8e0f8bdb1ebf2c987aee227586f3fd4b 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 --- libodb-qt4-vc12.sln | 28 +++++ libodb-qt5-vc12.sln | 28 +++++ makefile | 12 ++- odb/qt/libodb-qt4-vc12.vcxproj | 182 +++++++++++++++++++++++++++++++++ odb/qt/libodb-qt4-vc12.vcxproj.filters | 19 ++++ odb/qt/libodb-qt5-vc12.vcxproj | 182 +++++++++++++++++++++++++++++++++ odb/qt/libodb-qt5-vc12.vcxproj.filters | 19 ++++ odb/qt/makefile | 7 +- 8 files changed, 473 insertions(+), 4 deletions(-) create mode 100644 libodb-qt4-vc12.sln create mode 100644 libodb-qt5-vc12.sln create mode 100644 odb/qt/libodb-qt4-vc12.vcxproj create mode 100644 odb/qt/libodb-qt4-vc12.vcxproj.filters create mode 100644 odb/qt/libodb-qt5-vc12.vcxproj create mode 100644 odb/qt/libodb-qt5-vc12.vcxproj.filters diff --git a/libodb-qt4-vc12.sln b/libodb-qt4-vc12.sln new file mode 100644 index 0000000..c88a6c7 --- /dev/null +++ b/libodb-qt4-vc12.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-qt", "odb\qt\libodb-qt4-vc11.vcxproj", "{4392B1DA-5467-11E0-93E8-00E0812AE2E8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|Win32.ActiveCfg = Debug|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|Win32.Build.0 = Debug|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|x64.ActiveCfg = Debug|x64 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|x64.Build.0 = Debug|x64 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|Win32.ActiveCfg = Release|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|Win32.Build.0 = Release|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|x64.ActiveCfg = Release|x64 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libodb-qt5-vc12.sln b/libodb-qt5-vc12.sln new file mode 100644 index 0000000..078fc73 --- /dev/null +++ b/libodb-qt5-vc12.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-qt", "odb\qt\libodb-qt5-vc11.vcxproj", "{4392B1DA-5467-11E0-93E8-00E0812AE2E8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|Win32.ActiveCfg = Debug|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|Win32.Build.0 = Debug|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|x64.ActiveCfg = Debug|x64 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Debug|x64.Build.0 = Debug|x64 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|Win32.ActiveCfg = Release|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|Win32.Build.0 = Release|Win32 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|x64.ActiveCfg = Release|x64 + {4392B1DA-5467-11E0-93E8-00E0812AE2E8}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index b8dc539..2e65145 100644 --- a/makefile +++ b/makefile @@ -16,9 +16,15 @@ $(dist): export dirs := $(dirs) $(dist): export docs := GPLv2 LICENSE README NEWS version $(dist): export options := odb/qt.options $(dist): data_dist := INSTALL \ -libodb-qt4-vc8.sln \ -libodb-qt4-vc9.sln libodb-qt4-vc10.sln libodb-qt4-vc11.sln \ -libodb-qt5-vc9.sln libodb-qt5-vc10.sln libodb-qt5-vc11.sln +libodb-qt4-vc8.sln \ +libodb-qt4-vc9.sln \ +libodb-qt4-vc10.sln \ +libodb-qt4-vc11.sln \ +libodb-qt4-vc12.sln \ +libodb-qt5-vc9.sln \ +libodb-qt5-vc10.sln \ +libodb-qt5-vc11.sln \ +libodb-qt5-vc12.sln $(dist): exec_dist := bootstrap $(dist): export extra_dist := $(data_dist) $(exec_dist) $(dist): export version = $(shell cat $(src_root)/version) diff --git a/odb/qt/libodb-qt4-vc12.vcxproj b/odb/qt/libodb-qt4-vc12.vcxproj new file mode 100644 index 0000000..6c97c0d --- /dev/null +++ b/odb/qt/libodb-qt4-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4392B1DA-5467-11E0-93E8-00E0812AE2E8} + Win32Proj + libodb-qt + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-qt4-d-__value__(interface_version)-vc11 + + + true + ..\..\bin64\ + odb-qt4-d-__value__(interface_version)-vc11 + + + false + ..\..\bin\ + odb-qt4-__value__(interface_version)-vc11 + + + false + ..\..\bin64\ + odb-qt4-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb-d.lib;QtCored4.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-qt-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb-d.lib;QtCored4.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-qt-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb.lib;QtCore4.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-qt.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb.lib;QtCore4.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-qt.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/qt/libodb-qt4-vc12.vcxproj.filters b/odb/qt/libodb-qt4-vc12.vcxproj.filters new file mode 100644 index 0000000..083a1e7 --- /dev/null +++ b/odb/qt/libodb-qt4-vc12.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {6D8C47F8-5566-11E0-8D23-00E0812AE2E8} + cxx + + + {8808F89C-5566-11E0-853E-00E0812AE2E8} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/qt/libodb-qt5-vc12.vcxproj b/odb/qt/libodb-qt5-vc12.vcxproj new file mode 100644 index 0000000..e36ab41 --- /dev/null +++ b/odb/qt/libodb-qt5-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4392B1DA-5467-11E0-93E8-00E0812AE2E8} + Win32Proj + libodb-qt + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-qt5-d-__value__(interface_version)-vc11 + + + true + ..\..\bin64\ + odb-qt5-d-__value__(interface_version)-vc11 + + + false + ..\..\bin\ + odb-qt5-__value__(interface_version)-vc11 + + + false + ..\..\bin64\ + odb-qt5-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb-d.lib;Qt5Cored.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-qt-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb-d.lib;Qt5Cored.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-qt-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb.lib;Qt5Core.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-qt.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + odb.lib;Qt5Core.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-qt.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/qt/libodb-qt5-vc12.vcxproj.filters b/odb/qt/libodb-qt5-vc12.vcxproj.filters new file mode 100644 index 0000000..083a1e7 --- /dev/null +++ b/odb/qt/libodb-qt5-vc12.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {6D8C47F8-5566-11E0-8D23-00E0812AE2E8} + cxx + + + {8808F89C-5566-11E0-853E-00E0812AE2E8} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/qt/makefile b/odb/qt/makefile index 9e4a8a6..f0ef875 100644 --- a/odb/qt/makefile +++ b/odb/qt/makefile @@ -68,7 +68,9 @@ libodb-qt5-vc9.vcproj \ libodb-qt4-vc10.vcxproj libodb-qt4-vc10.vcxproj.filters \ libodb-qt5-vc10.vcxproj libodb-qt5-vc10.vcxproj.filters \ libodb-qt4-vc11.vcxproj libodb-qt4-vc11.vcxproj.filters \ -libodb-qt5-vc11.vcxproj libodb-qt5-vc11.vcxproj.filters +libodb-qt5-vc11.vcxproj libodb-qt5-vc11.vcxproj.filters \ +libodb-qt4-vc12.vcxproj libodb-qt4-vc12.vcxproj.filters \ +libodb-qt5-vc12.vcxproj libodb-qt5-vc12.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) @@ -81,6 +83,8 @@ $(dist): $(call meta-vc10proj,$(src_base)/libodb-qt5-vc10.vcxproj) $(call meta-vc11proj,$(src_base)/libodb-qt4-vc11.vcxproj) $(call meta-vc11proj,$(src_base)/libodb-qt5-vc11.vcxproj) + $(call meta-vc12proj,$(src_base)/libodb-qt4-vc12.vcxproj) + $(call meta-vc12proj,$(src_base)/libodb-qt5-vc12.vcxproj) $(call meta-automake) # Clean. @@ -109,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/o-l.make) -- cgit v1.1