From a77615868e8935e84ebbb4c441858917e971942c 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 --- INSTALL | 4 +- etc/sqlite/README | 2 +- etc/sqlite/sqlite3-vc11.sln | 26 ++++ etc/sqlite/sqlite3-vc11.vcxproj | 174 +++++++++++++++++++++++++ etc/sqlite/sqlite3-vc11.vcxproj.filters | 23 ++++ libodb-sqlite-vc11.sln | 26 ++++ makefile | 1 + odb/sqlite/libodb-sqlite-vc11.vcxproj | 178 ++++++++++++++++++++++++++ odb/sqlite/libodb-sqlite-vc11.vcxproj.filters | 19 +++ odb/sqlite/makefile | 5 +- 10 files changed, 454 insertions(+), 4 deletions(-) create mode 100644 etc/sqlite/sqlite3-vc11.sln create mode 100644 etc/sqlite/sqlite3-vc11.vcxproj create mode 100644 etc/sqlite/sqlite3-vc11.vcxproj.filters create mode 100644 libodb-sqlite-vc11.sln create mode 100644 odb/sqlite/libodb-sqlite-vc11.vcxproj create mode 100644 odb/sqlite/libodb-sqlite-vc11.vcxproj.filters diff --git a/INSTALL b/INSTALL index fd17aff..842f545 100644 --- a/INSTALL +++ b/INSTALL @@ -79,8 +79,8 @@ can change this by manually removing the LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY macro from the project's "Preprocessor Definitions" settings). The SQLite source distribution for Windows lacks Visual Studio project/solution files. -To rectify this situation, the libodb-sqlite distribution includes, in -the etc\sqlite\ directory, Visual Studio 9 and 10 project/solution files +To rectify this situation, the libodb-sqlite distribution includes, in the +etc\sqlite\ directory, Visual Studio 9, 10, and 11 project/solution files for building 32 and 64-bit SQLite libraries with unlock notify support. Refer to the accompanying README file for information on how to build the libraries and configure VC++ Directories to automatically locate them. diff --git a/etc/sqlite/README b/etc/sqlite/README index c16c832..b147916 100644 --- a/etc/sqlite/README +++ b/etc/sqlite/README @@ -1,5 +1,5 @@ This directory contains project/solution files for building SQLite libraries -with Microsoft Visual Studio versions 9 and 10. +with Microsoft Visual Studio versions 9, 10, and 11. To build SQLite, you will need to download two SQLite packages: sqlite- amalgamation and sqlite-dll. Copy the sqlite3.c and sqlite3.h files from the diff --git a/etc/sqlite/sqlite3-vc11.sln b/etc/sqlite/sqlite3-vc11.sln new file mode 100644 index 0000000..89ed59f --- /dev/null +++ b/etc/sqlite/sqlite3-vc11.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3-vc11.vcxproj", "{3409C5BB-974C-44FC-A9DB-2176837E9035}" +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 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Debug|Win32.ActiveCfg = Debug|Win32 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Debug|Win32.Build.0 = Debug|Win32 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Debug|x64.ActiveCfg = Debug|x64 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Debug|x64.Build.0 = Debug|x64 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Release|Win32.ActiveCfg = Release|Win32 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Release|Win32.Build.0 = Release|Win32 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Release|x64.ActiveCfg = Release|x64 + {3409C5BB-974C-44FC-A9DB-2176837E9035}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/etc/sqlite/sqlite3-vc11.vcxproj b/etc/sqlite/sqlite3-vc11.vcxproj new file mode 100644 index 0000000..9174372 --- /dev/null +++ b/etc/sqlite/sqlite3-vc11.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3409C5BB-974C-44FC-A9DB-2176837E9035} + Win32Proj + sqlite3 + + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + bin\ + sqlite3-d + + + true + bin64\ + sqlite3-d + + + false + bin\ + sqlite3 + + + false + bin64\ + sqlite3 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_OS_WIN=1;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_UNLOCK_NOTIFY=1;%(PreprocessorDefinitions) + + + Windows + true + $(TargetPath) + lib\sqlite3-d.lib + sqlite3.def + /EXPORT:sqlite3_unlock_notify %(AdditionalOptions) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_OS_WIN=1;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_UNLOCK_NOTIFY=1;%(PreprocessorDefinitions) + + + Windows + true + $(TargetPath) + lib64\sqlite3-d.lib + sqlite3.def + /EXPORT:sqlite3_unlock_notify %(AdditionalOptions) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_OS_WIN=1;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_UNLOCK_NOTIFY=1;%(PreprocessorDefinitions) + + + Windows + true + true + true + $(TargetPath) + lib\sqlite3.lib + sqlite3.def + /EXPORT:sqlite3_unlock_notify %(AdditionalOptions) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_OS_WIN=1;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_UNLOCK_NOTIFY=1;%(PreprocessorDefinitions) + + + Windows + true + true + true + $(TargetPath) + lib64\sqlite3.lib + sqlite3.def + /EXPORT:sqlite3_unlock_notify %(AdditionalOptions) + + + + + + + + + + + + diff --git a/etc/sqlite/sqlite3-vc11.vcxproj.filters b/etc/sqlite/sqlite3-vc11.vcxproj.filters new file mode 100644 index 0000000..13685a4 --- /dev/null +++ b/etc/sqlite/sqlite3-vc11.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/libodb-sqlite-vc11.sln b/libodb-sqlite-vc11.sln new file mode 100644 index 0000000..0ca7868 --- /dev/null +++ b/libodb-sqlite-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-sqlite", "odb\sqlite\libodb-sqlite-vc11.vcxproj", "{BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}" +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 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Debug|Win32.Build.0 = Debug|Win32 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Debug|x64.ActiveCfg = Debug|x64 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Debug|x64.Build.0 = Debug|x64 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Release|Win32.ActiveCfg = Release|Win32 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Release|Win32.Build.0 = Release|Win32 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Release|x64.ActiveCfg = Release|x64 + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index 79a5007..6611491 100644 --- a/makefile +++ b/makefile @@ -15,6 +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-sqlite-vc9.sln libodb-sqlite-vc10.sln \ +libodb-sqlite-vc11.sln \ $(subst $(src_base)/,,$(shell find $(src_base)/etc -type f)) $(dist): exec_dist := bootstrap $(dist): export extra_dist := $(data_dist) $(exec_dist) diff --git a/odb/sqlite/libodb-sqlite-vc11.vcxproj b/odb/sqlite/libodb-sqlite-vc11.vcxproj new file mode 100644 index 0000000..3ec1701 --- /dev/null +++ b/odb/sqlite/libodb-sqlite-vc11.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BE62AFC4-4624-4CDA-A7CD-E9451D34AB6E} + Win32Proj + libodb-sqlite + + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + true + v110 + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-sqlite-d-__value__(interface_version)-vc11 + + + true + ..\..\bin64\ + odb-sqlite-d-__value__(interface_version)-vc11 + + + false + ..\..\bin\ + odb-sqlite-__value__(interface_version)-vc11 + + + false + ..\..\bin64\ + odb-sqlite-__value__(interface_version)-vc11 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_SQLITE_DYNAMIC_LIB;LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb-d.lib;sqlite3.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-sqlite-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_SQLITE_DYNAMIC_LIB;LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb-d.lib;sqlite3.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-sqlite-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_SQLITE_DYNAMIC_LIB;LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb.lib;sqlite3.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-sqlite.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_SQLITE_DYNAMIC_LIB;LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;4267;%(DisableSpecificWarnings) + + + odb.lib;sqlite3.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-sqlite.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/sqlite/libodb-sqlite-vc11.vcxproj.filters b/odb/sqlite/libodb-sqlite-vc11.vcxproj.filters new file mode 100644 index 0000000..6a1e44f --- /dev/null +++ b/odb/sqlite/libodb-sqlite-vc11.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {CAE48EC7-E979-4076-ABDB-DF5CFD41D7AB} + cxx + + + {1C70458E-63CA-455F-AFDC-E2F291BD0F2A} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/sqlite/makefile b/odb/sqlite/makefile index 8674e4a..a1e8c17 100644 --- a/odb/sqlite/makefile +++ b/odb/sqlite/makefile @@ -96,7 +96,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-sqlite-vc9.vcproj \ -libodb-sqlite-vc10.vcxproj libodb-sqlite-vc10.vcxproj.filters +libodb-sqlite-vc10.vcxproj libodb-sqlite-vc10.vcxproj.filters \ +libodb-sqlite-vc11.vcxproj libodb-sqlite-vc11.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ 's/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) @@ -105,6 +106,7 @@ $(dist): $(gen) $(call dist-data,$(gen_dist),$(dist_prefix)/odb/sqlite/details) $(call meta-vc9proj,$(src_base)/libodb-sqlite-vc9.vcproj) $(call meta-vc10proj,$(src_base)/libodb-sqlite-vc10.vcxproj) + $(call meta-vc11proj,$(src_base)/libodb-sqlite-vc11.vcxproj) $(call meta-automake) # Clean. @@ -132,6 +134,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