From 7b31bf12b9f517e2a9795d63a1701cdf23279d5a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 8 Jul 2013 14:54:20 +0200 Subject: Add support for Visual Studio 2005 --- libcommon/common/common.cxx | 2 +- libcommon/common/config-vc.h | 2 +- libcommon/common/libcommon-vc8.vcproj | 352 ++++++++++++++++++++++++++++++++++ libcommon/common/makefile | 7 +- libcommon/libcommon-vc8.sln | 26 +++ libcommon/makefile | 6 +- 6 files changed, 389 insertions(+), 6 deletions(-) create mode 100644 libcommon/common/libcommon-vc8.vcproj create mode 100644 libcommon/libcommon-vc8.sln (limited to 'libcommon') diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx index 4ca2b68..ba7118a 100644 --- a/libcommon/common/common.cxx +++ b/libcommon/common/common.cxx @@ -231,7 +231,7 @@ create_database (int argc, #endif ) { - char** argp (argv + 1); // Position of the next argument. + char** argp = argv + 1; // Position of the next argument. Assignment for VC8. int argn (argc - 1); // Number of arguments left. #if defined(DATABASE_COMMON) diff --git a/libcommon/common/config-vc.h b/libcommon/common/config-vc.h index 1f05206..17d1bd0 100644 --- a/libcommon/common/config-vc.h +++ b/libcommon/common/config-vc.h @@ -10,7 +10,7 @@ #define HAVE_TR1_MEMORY -/* VC++10 has C++11 always enabled. +/* VC++10 and later has C++11 always enabled. */ #if (defined(_MSC_VER) && _MSC_VER >= 1600) || \ (defined(ODB_MSC_VER) && ODB_MSC_VER >= 1600) diff --git a/libcommon/common/libcommon-vc8.vcproj b/libcommon/common/libcommon-vc8.vcproj new file mode 100644 index 0000000..ab5656a --- /dev/null +++ b/libcommon/common/libcommon-vc8.vcproj @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +__source_entries__(sources) + + +__file_entries__(headers) + + + + + diff --git a/libcommon/common/makefile b/libcommon/common/makefile index 5d23fa9..5647ba2 100644 --- a/libcommon/common/makefile +++ b/libcommon/common/makefile @@ -120,12 +120,14 @@ $(dist): export sources := $(cxx_tun) $(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ -name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) $(dist): data_dist := config.h.in config-vc.h -$(dist): export extra_dist := $(data_dist) $(call vc9projs,libcommon) \ -$(call vc10projs,libcommon) $(call vc11projs,libcommon) +$(dist): export extra_dist := $(data_dist) $(call vc8projs,libcommon) \ +$(call vc9projs,libcommon) $(call vc10projs,libcommon) \ +$(call vc11projs,libcommon) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake) + $(call meta-vc8projs,libcommon) $(call meta-vc9projs,libcommon) $(call meta-vc10projs,libcommon) $(call meta-vc11projs,libcommon) @@ -152,6 +154,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) diff --git a/libcommon/libcommon-vc8.sln b/libcommon/libcommon-vc8.sln new file mode 100644 index 0000000..73326f5 --- /dev/null +++ b/libcommon/libcommon-vc8.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcommon", "common\libcommon-__value__(database)-vc8.vcproj", "{8575F058-1BD6-4F97-8901-83D0110C2B6B}" +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 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Debug|Win32.ActiveCfg = Debug|Win32 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Debug|Win32.Build.0 = Debug|Win32 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Debug|x64.ActiveCfg = Debug|x64 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Debug|x64.Build.0 = Debug|x64 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Release|Win32.ActiveCfg = Release|Win32 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Release|Win32.Build.0 = Release|Win32 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Release|x64.ActiveCfg = Release|x64 + {8575F058-1BD6-4F97-8901-83D0110C2B6B}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libcommon/makefile b/libcommon/makefile index cade0e7..e1fc2db 100644 --- a/libcommon/makefile +++ b/libcommon/makefile @@ -9,16 +9,18 @@ dirs := common $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) -$(dist): export extra_dist := $(call vc9slns,libcommon) \ -$(call vc10slns,libcommon) $(call vc11slns,libcommon) +$(dist): export extra_dist := $(call vc8slns,libcommon) \ +$(call vc9slns,libcommon) $(call vc10slns,libcommon) $(call vc11slns,libcommon) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) $(call meta-automake) + $(call meta-vc8slns,libcommon) $(call meta-vc9slns,libcommon) $(call meta-vc10slns,libcommon) $(call meta-vc11slns,libcommon) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs))) +$(call include,$(bld_root)/meta/vc8sln.make) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) $(call include,$(bld_root)/meta/vc11sln.make) -- cgit v1.1