From 26d14b53b724911f278e539f2cdf48e89f0fa41c 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-oracle-vc12.sln | 28 ++++ makefile | 2 +- odb/oracle/libodb-oracle-vc12.vcxproj | 182 ++++++++++++++++++++++++++ odb/oracle/libodb-oracle-vc12.vcxproj.filters | 19 +++ odb/oracle/makefile | 5 +- 5 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 libodb-oracle-vc12.sln create mode 100644 odb/oracle/libodb-oracle-vc12.vcxproj create mode 100644 odb/oracle/libodb-oracle-vc12.vcxproj.filters diff --git a/libodb-oracle-vc12.sln b/libodb-oracle-vc12.sln new file mode 100644 index 0000000..b790bf3 --- /dev/null +++ b/libodb-oracle-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("{C1335C92-809F-41A7-877A-4A0193D974D3}") = "libodb-oracle", "odb\oracle\libodb-oracle-vc11.vcxproj", "{C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}" +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 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.ActiveCfg = Debug|Win32 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|Win32.Build.0 = Debug|Win32 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.ActiveCfg = Debug|x64 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Debug|x64.Build.0 = Debug|x64 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.ActiveCfg = Release|Win32 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|Win32.Build.0 = Release|Win32 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.ActiveCfg = Release|x64 + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index b47210f..b16d16e 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,7 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) $(dist): export docs := LICENSE NCUEL README NEWS version $(dist): data_dist := INSTALL libodb-oracle-vc8.sln libodb-oracle-vc9.sln \ -libodb-oracle-vc10.sln libodb-oracle-vc11.sln +libodb-oracle-vc10.sln libodb-oracle-vc11.sln libodb-oracle-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/oracle/libodb-oracle-vc12.vcxproj b/odb/oracle/libodb-oracle-vc12.vcxproj new file mode 100644 index 0000000..9cb197d --- /dev/null +++ b/odb/oracle/libodb-oracle-vc12.vcxproj @@ -0,0 +1,182 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C47F2161-7F5A-4ADB-8CF3-FDFF1D0ACD5C} + Win32Proj + libodb-oracle + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-oracle-d-__value__(interface_version)-vc11 + + + true + ..\..\bin64\ + odb-oracle-d-__value__(interface_version)-vc11 + + + false + ..\..\bin\ + odb-oracle-__value__(interface_version)-vc11 + + + false + ..\..\bin64\ + odb-oracle-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + true + + + odb-d.lib;oci.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-oracle-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + true + + + odb-d.lib;oci.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-oracle-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + true + + + odb.lib;oci.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-oracle.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_ORACLE_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + true + + + odb.lib;oci.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-oracle.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/oracle/libodb-oracle-vc12.vcxproj.filters b/odb/oracle/libodb-oracle-vc12.vcxproj.filters new file mode 100644 index 0000000..1891ddf --- /dev/null +++ b/odb/oracle/libodb-oracle-vc12.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {0E6C6336-4797-46CD-9081-7B19FAD26843} + cxx + + + {87786249-9DCA-4FE7-8E98-88D44FC9C7E3} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/oracle/makefile b/odb/oracle/makefile index 01a06bf..44a81a1 100644 --- a/odb/oracle/makefile +++ b/odb/oracle/makefile @@ -103,7 +103,8 @@ $(dist): data_dist := $(cli_tun) details/config.h.in $(dist): export extra_dist := $(data_dist) \ libodb-oracle-vc8.vcproj libodb-oracle-vc9.vcproj \ libodb-oracle-vc10.vcxproj libodb-oracle-vc10.vcxproj.filters \ -libodb-oracle-vc11.vcxproj libodb-oracle-vc11.vcxproj.filters +libodb-oracle-vc11.vcxproj libodb-oracle-vc11.vcxproj.filters \ +libodb-oracle-vc12.vcxproj libodb-oracle-vc12.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) @@ -114,6 +115,7 @@ $(dist): $(gen) $(call meta-vc9proj,$(src_base)/libodb-oracle-vc9.vcproj) $(call meta-vc10proj,$(src_base)/libodb-oracle-vc10.vcxproj) $(call meta-vc11proj,$(src_base)/libodb-oracle-vc11.vcxproj) + $(call meta-vc12proj,$(src_base)/libodb-oracle-vc12.vcxproj) $(call meta-automake) # Clean. @@ -143,6 +145,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,$(cli_rules)) -- cgit v1.1