From 44846d8af462f0823836691b488483bb7d9d2db1 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 16 Sep 2012 13:21:49 +0200 Subject: Add support for Visual Studio 2012 --- libodb-qt-vc11.sln | 26 +++++ makefile | 3 +- odb/qt/libodb-qt-vc11.vcxproj | 178 ++++++++++++++++++++++++++++++++++ odb/qt/libodb-qt-vc11.vcxproj.filters | 19 ++++ odb/qt/makefile | 9 +- 5 files changed, 231 insertions(+), 4 deletions(-) create mode 100644 libodb-qt-vc11.sln create mode 100644 odb/qt/libodb-qt-vc11.vcxproj create mode 100644 odb/qt/libodb-qt-vc11.vcxproj.filters diff --git a/libodb-qt-vc11.sln b/libodb-qt-vc11.sln new file mode 100644 index 0000000..31cedc1 --- /dev/null +++ b/libodb-qt-vc11.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-qt", "odb\qt\libodb-qt-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 f132d5c..668a359 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,8 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) $(dist): export docs := GPLv2 LICENSE README NEWS version $(dist): export options := odb/qt.options -$(dist): data_dist := INSTALL libodb-qt-vc9.sln libodb-qt-vc10.sln +$(dist): data_dist := INSTALL libodb-qt-vc9.sln libodb-qt-vc10.sln \ +libodb-qt-vc11.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-qt-vc11.vcxproj b/odb/qt/libodb-qt-vc11.vcxproj new file mode 100644 index 0000000..a5b6cf8 --- /dev/null +++ b/odb/qt/libodb-qt-vc11.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4392B1DA-5467-11E0-93E8-00E0812AE2E8} + Win32Proj + libodb-qt + + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-qt-d-__value__(interface_version)-vc11 + + + true + ..\..\bin64\ + odb-qt-d-__value__(interface_version)-vc11 + + + false + ..\..\bin\ + odb-qt-__value__(interface_version)-vc11 + + + false + ..\..\bin64\ + odb-qt-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_QT_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + 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) + + + 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) + + + 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) + + + 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-qt-vc11.vcxproj.filters b/odb/qt/libodb-qt-vc11.vcxproj.filters new file mode 100644 index 0000000..083a1e7 --- /dev/null +++ b/odb/qt/libodb-qt-vc11.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 b0e8c7f..67cd22c 100644 --- a/odb/qt/makefile +++ b/odb/qt/makefile @@ -62,14 +62,16 @@ $(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ $(dist): export options = $(subst $(src_base)/,,$(shell find $(src_base) \ -name '*.options')) $(dist): export extra_dist := libodb-qt-vc9.vcproj \ -libodb-qt-vc10.vcxproj libodb-qt-vc10.vcxproj.filters +libodb-qt-vc10.vcxproj libodb-qt-vc10.vcxproj.filters \ +libodb-qt-vc11.vcxproj libodb-qt-vc11.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) $(dist): $(call dist-data,$(sources) $(headers) $(options) details/config.h.in) - $(call meta-vc9proj,libodb-qt-vc9.vcproj) - $(call meta-vc10proj,libodb-qt-vc10.vcxproj) + $(call meta-vc9proj,$(src_base)/libodb-qt-vc9.vcproj) + $(call meta-vc10proj,$(src_base)/libodb-qt-vc10.vcxproj) + $(call meta-vc11proj,$(src_base)/libodb-qt-vc11.vcxproj) $(call meta-automake) # Clean. @@ -96,6 +98,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/o-l.make) -- cgit v1.1