From 4c50b1653158ad66731bf4a0e3d5750d9d5b66c8 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-vc12.sln | 28 +++++++ makefile | 2 +- odb/libodb-vc12.vcxproj | 181 ++++++++++++++++++++++++++++++++++++++++ odb/libodb-vc12.vcxproj.filters | 21 +++++ odb/makefile | 5 +- 5 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 libodb-vc12.sln create mode 100644 odb/libodb-vc12.vcxproj create mode 100644 odb/libodb-vc12.vcxproj.filters diff --git a/libodb-vc12.sln b/libodb-vc12.sln new file mode 100644 index 0000000..a902c5b --- /dev/null +++ b/libodb-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", "odb\libodb-vc11.vcxproj", "{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}" +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 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.Build.0 = Debug|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.ActiveCfg = Debug|x64 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.Build.0 = Debug|x64 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.ActiveCfg = Release|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.Build.0 = Release|Win32 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.ActiveCfg = Release|x64 + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index 1025eca..cf53ec2 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,7 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) $(dist): export docs := GPLv2 LICENSE README NEWS version $(dist): data_dist := INSTALL libodb-vc8.sln libodb-vc9.sln libodb-vc10.sln \ -libodb-vc11.sln +libodb-vc11.sln libodb-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/libodb-vc12.vcxproj b/odb/libodb-vc12.vcxproj new file mode 100644 index 0000000..ed2e11c --- /dev/null +++ b/odb/libodb-vc12.vcxproj @@ -0,0 +1,181 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1C53C543-8038-4C8A-8AB1-65E74FD7DE2E} + Win32Proj + libodb + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\bin\ + odb-d-__value__(interface_version)-vc11 + + + true + ..\bin64\ + odb-d-__value__(interface_version)-vc11 + + + false + ..\bin\ + odb-__value__(interface_version)-vc11 + + + false + ..\bin64\ + odb-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + Windows + true + $(TargetPath) + ..\lib\odb-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + Windows + true + $(TargetPath) + ..\lib64\odb-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + Windows + true + true + true + $(TargetPath) + ..\lib\odb.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions) + .. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + true + + + Windows + true + true + true + $(TargetPath) + ..\lib64\odb.lib + + + +__header_entries__(headers) +__header_entry__(details\config-vc.h) + + +__source_entries__(sources) +__source_entries__(win32_threads_sources) +__source_entries__(win32_dll_sources) + + + + + diff --git a/odb/libodb-vc12.vcxproj.filters b/odb/libodb-vc12.vcxproj.filters new file mode 100644 index 0000000..da1d6b2 --- /dev/null +++ b/odb/libodb-vc12.vcxproj.filters @@ -0,0 +1,21 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cxx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) +__header_filter_entry__(details\config-vc.h) + + +__source_filter_entries__(sources) +__source_filter_entries__(win32_threads_sources) + + diff --git a/odb/makefile b/odb/makefile index 25ac250..f4dce5f 100644 --- a/odb/makefile +++ b/odb/makefile @@ -136,7 +136,8 @@ $(dist): data_dist := details/config-vc.h $(dist): export extra_dist := $(data_dist) \ libodb-vc8.vcproj libodb-vc9.vcproj \ libodb-vc10.vcxproj libodb-vc10.vcxproj.filters \ -libodb-vc11.vcxproj libodb-vc11.vcxproj.filters +libodb-vc11.vcxproj libodb-vc11.vcxproj.filters \ +libodb-vc12.vcxproj libodb-vc12.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) @@ -149,6 +150,7 @@ $(data_dist) details/config.h.in) $(call meta-vc9proj,$(src_base)/libodb-vc9.vcproj) $(call meta-vc10proj,$(src_base)/libodb-vc10.vcxproj) $(call meta-vc11proj,$(src_base)/libodb-vc11.vcxproj) + $(call meta-vc12proj,$(src_base)/libodb-vc12.vcxproj) $(call meta-automake) # Clean. @@ -177,6 +179,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