From f8a9600d83a7ebaa0321a59d1b2ebb53671f665d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 16 Sep 2012 13:21:48 +0200 Subject: Add support for Visual Studio 2012 --- libodb-pgsql-vc11.sln | 26 ++++ makefile | 3 +- odb/pgsql/libodb-pgsql-vc11.vcxproj | 178 ++++++++++++++++++++++++++++ odb/pgsql/libodb-pgsql-vc11.vcxproj.filters | 19 +++ odb/pgsql/makefile | 5 +- 5 files changed, 229 insertions(+), 2 deletions(-) create mode 100644 libodb-pgsql-vc11.sln create mode 100644 odb/pgsql/libodb-pgsql-vc11.vcxproj create mode 100644 odb/pgsql/libodb-pgsql-vc11.vcxproj.filters diff --git a/libodb-pgsql-vc11.sln b/libodb-pgsql-vc11.sln new file mode 100644 index 0000000..e318293 --- /dev/null +++ b/libodb-pgsql-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-pgsql", "odb\pgsql\libodb-pgsql-vc11.vcxproj", {B6185C00-39EC-4429-B774-164B4397B995}" +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 + {B6185C00-39EC-4429-B774-164B4397B995}.Debug|Win32.ActiveCfg = Debug|Win32 + {B6185C00-39EC-4429-B774-164B4397B995}.Debug|Win32.Build.0 = Debug|Win32 + {B6185C00-39EC-4429-B774-164B4397B995}.Debug|x64.ActiveCfg = Debug|x64 + {B6185C00-39EC-4429-B774-164B4397B995}.Debug|x64.Build.0 = Debug|x64 + {B6185C00-39EC-4429-B774-164B4397B995}.Release|Win32.ActiveCfg = Release|Win32 + {B6185C00-39EC-4429-B774-164B4397B995}.Release|Win32.Build.0 = Release|Win32 + {B6185C00-39EC-4429-B774-164B4397B995}.Release|x64.ActiveCfg = Release|x64 + {B6185C00-39EC-4429-B774-164B4397B995}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index 29c4ca6..8921350 100644 --- a/makefile +++ b/makefile @@ -14,7 +14,8 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) $(dist): export docs := GPLv2 LICENSE README NEWS version -$(dist): data_dist := INSTALL libodb-pgsql-vc9.sln libodb-pgsql-vc10.sln +$(dist): data_dist := INSTALL libodb-pgsql-vc9.sln libodb-pgsql-vc10.sln \ +libodb-pgsql-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/pgsql/libodb-pgsql-vc11.vcxproj b/odb/pgsql/libodb-pgsql-vc11.vcxproj new file mode 100644 index 0000000..86d2f81 --- /dev/null +++ b/odb/pgsql/libodb-pgsql-vc11.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B6185C00-39EC-4429-B774-164B4397B995} + Win32Proj + libodb-pgsql + + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-pgsql-d-__value__(interface_version)-vc11 + + + true + ..\..\bin64\ + odb-pgsql-d-__value__(interface_version)-vc11 + + + false + ..\..\bin\ + odb-pgsql-__value__(interface_version)-vc11 + + + false + ..\..\bin64\ + odb-pgsql-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb-d.lib;libpq.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-pgsql-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb-d.lib;libpq.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-pgsql-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb.lib;libpq.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-pgsql.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb.lib;libpq.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-pgsql.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/pgsql/libodb-pgsql-vc11.vcxproj.filters b/odb/pgsql/libodb-pgsql-vc11.vcxproj.filters new file mode 100644 index 0000000..781fff8 --- /dev/null +++ b/odb/pgsql/libodb-pgsql-vc11.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {A070BD3A-62AD-4ED5-8080-860954BF9EF8} + cxx + + + {8586465A-41C6-4A76-B0AA-256E10243DC2} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile index 004f061..b343fce 100644 --- a/odb/pgsql/makefile +++ b/odb/pgsql/makefile @@ -98,7 +98,8 @@ $(dist): export headers = $(sort $(headers_dist) $(gen_headers)) $(dist): gen_dist := $(gen) $(dist): data_dist := $(cli_tun) details/config.h.in $(dist): export extra_dist := $(data_dist) libodb-pgsql-vc9.vcproj \ -libodb-pgsql-vc10.vcxproj libodb-pgsql-vc10.vcxproj.filters +libodb-pgsql-vc10.vcxproj libodb-pgsql-vc10.vcxproj.filters \ +libodb-pgsql-vc11.vcxproj libodb-pgsql-vc11.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) @@ -107,6 +108,7 @@ $(dist): $(gen) $(call dist-data,$(gen_dist),$(dist_prefix)/odb/pgsql/details) $(call meta-vc9proj,$(src_base)/libodb-pgsql-vc9.vcproj) $(call meta-vc10proj,$(src_base)/libodb-pgsql-vc10.vcxproj) + $(call meta-vc11proj,$(src_base)/libodb-pgsql-vc11.vcxproj) $(call meta-automake) # Clean. @@ -134,6 +136,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,$(cli_rules)) -- cgit v1.1