From cc6a67b76a09660b27fea50856f49cfdfe013da0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 8 Jul 2013 14:54:19 +0200 Subject: Add support for Visual Studio 2005 --- libodb-boost-vc8.sln | 26 ++ makefile | 4 +- odb/boost/date-time/mysql/posix-time-traits.hxx | 5 +- odb/boost/libodb-boost-vc8.vcproj | 352 ++++++++++++++++++++++++ odb/boost/makefile | 4 +- 5 files changed, 387 insertions(+), 4 deletions(-) create mode 100644 libodb-boost-vc8.sln create mode 100644 odb/boost/libodb-boost-vc8.vcproj diff --git a/libodb-boost-vc8.sln b/libodb-boost-vc8.sln new file mode 100644 index 0000000..4a79cd4 --- /dev/null +++ b/libodb-boost-vc8.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-boost", "odb\boost\libodb-boost-vc8.vcproj", "{07ADE873-116E-41E2-9011-4D03641049D6}" +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 + {07ADE873-116E-41E2-9011-4D03641049D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {07ADE873-116E-41E2-9011-4D03641049D6}.Debug|Win32.Build.0 = Debug|Win32 + {07ADE873-116E-41E2-9011-4D03641049D6}.Debug|x64.ActiveCfg = Debug|x64 + {07ADE873-116E-41E2-9011-4D03641049D6}.Debug|x64.Build.0 = Debug|x64 + {07ADE873-116E-41E2-9011-4D03641049D6}.Release|Win32.ActiveCfg = Release|Win32 + {07ADE873-116E-41E2-9011-4D03641049D6}.Release|Win32.Build.0 = Release|Win32 + {07ADE873-116E-41E2-9011-4D03641049D6}.Release|x64.ActiveCfg = Release|x64 + {07ADE873-116E-41E2-9011-4D03641049D6}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/makefile b/makefile index 71640f0..f4317f5 100644 --- a/makefile +++ b/makefile @@ -15,8 +15,8 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) $(dist): export docs := GPLv2 LICENSE README NEWS version $(dist): export options := odb/boost.options -$(dist): data_dist := INSTALL libodb-boost-vc9.sln libodb-boost-vc10.sln \ -libodb-boost-vc11.sln +$(dist): data_dist := INSTALL libodb-boost-vc8.sln libodb-boost-vc9.sln \ +libodb-boost-vc10.sln libodb-boost-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/boost/date-time/mysql/posix-time-traits.hxx b/odb/boost/date-time/mysql/posix-time-traits.hxx index 2f40445..9750d12 100644 --- a/odb/boost/date-time/mysql/posix-time-traits.hxx +++ b/odb/boost/date-time/mysql/posix-time-traits.hxx @@ -210,7 +210,10 @@ namespace odb i.minute = std::abs (v.minutes ()); i.second = std::abs (v.seconds ()); - unsigned long long ms (std::abs (v.fractional_seconds ())); + // Some compilers, e.g., VC8, don't have 64-bit abs() overload. + // + time_duration::fractional_seconds_type sms (v.fractional_seconds ()); + unsigned long long ms (sms >= 0 ? sms : -sms); ms = ms * 1000000ULL / time_duration::ticks_per_second (); i.second_part = static_cast (ms); } diff --git a/odb/boost/libodb-boost-vc8.vcproj b/odb/boost/libodb-boost-vc8.vcproj new file mode 100644 index 0000000..c4e144e --- /dev/null +++ b/odb/boost/libodb-boost-vc8.vcproj @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +__source_entries__(sources) + + +__file_entries__(headers) + + + + + diff --git a/odb/boost/makefile b/odb/boost/makefile index 376f658..0f812ad 100644 --- a/odb/boost/makefile +++ b/odb/boost/makefile @@ -55,7 +55,7 @@ $(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ -name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) $(dist): export options = $(subst $(src_base)/,,$(shell find $(src_base) \ -name '*.options')) -$(dist): export extra_dist := libodb-boost-vc9.vcproj \ +$(dist): export extra_dist := libodb-boost-vc8.vcproj libodb-boost-vc9.vcproj \ libodb-boost-vc10.vcxproj libodb-boost-vc10.vcxproj.filters \ libodb-boost-vc11.vcxproj libodb-boost-vc11.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ @@ -63,6 +63,7 @@ $(dist): export interface_version = $(shell sed -e \ $(dist): $(call dist-data,$(sources) $(headers) $(options) details/config.h.in) + $(call meta-vc8proj,$(src_base)/libodb-boost-vc8.vcproj) $(call meta-vc9proj,$(src_base)/libodb-boost-vc9.vcproj) $(call meta-vc10proj,$(src_base)/libodb-boost-vc10.vcxproj) $(call meta-vc11proj,$(src_base)/libodb-boost-vc11.vcxproj) @@ -90,6 +91,7 @@ endif # How to. # $(call include,$(bld_root)/dist.make) +$(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) -- cgit v1.1