From 9b48a24dde36e9f65d042d889bcdf6603c8662d4 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 17 Sep 2015 00:24:16 +0300 Subject: [PATCH] Added preliminary support for CLang-3.7 to MSVC projects --- cds/compiler/clang/defs.h | 14 +++ cds/compiler/gcc/compiler_macro.h | 104 ++++++++--------- cds/details/defs.h | 2 + projects/Win/vc14/cds.sln | 102 ++++++++++++++++- projects/Win/vc14/cds.vcxproj | 106 ++++++++++++++++++ projects/Win/vc14/hdr-test-deque.vcxproj | 100 +++++++++++++++++ projects/Win/vc14/hdr-test-list.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/hdr-test-map.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/hdr-test-misc.vcxproj | 99 ++++++++++++++++ .../Win/vc14/hdr-test-priority_queue.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/hdr-test-queue.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/hdr-test-set.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/hdr-test-stack.vcxproj | 100 +++++++++++++++++ .../Win/vc14/hdr-test-striped-set.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/hdr-test-tree.vcxproj | 99 ++++++++++++++++ projects/Win/vc14/unit-map-delodd.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-map-find.vcxproj | 91 +++++++++++++++ .../Win/vc14/unit-map-insdel-item.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-map-insdel.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-map-insdelfind.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-misc.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-pqueue.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-prerequisites.vcxproj | 105 +++++++++++++++++ projects/Win/vc14/unit-queue.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-set-delodd.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-set-insdel.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-set-insdelfind.vcxproj | 91 +++++++++++++++ projects/Win/vc14/unit-stack.vcxproj | 91 +++++++++++++++ src/dllmain.cpp | 4 +- 29 files changed, 2466 insertions(+), 55 deletions(-) diff --git a/cds/compiler/clang/defs.h b/cds/compiler/clang/defs.h index 5a92cf5b..12a2ab4e 100644 --- a/cds/compiler/clang/defs.h +++ b/cds/compiler/clang/defs.h @@ -26,6 +26,20 @@ # define CDS_USE_LIBCDS_ATOMIC #endif +// clang for Windows +#if defined( _MSC_VER ) +# define CDS_OS_INTERFACE CDS_OSI_WINDOWS +# if defined(_WIN64) +# define CDS_OS_TYPE CDS_OS_WIN64 +# define CDS_OS__NAME "Win64" +# define CDS_OS__NICK "Win64" +# elif defined(_WIN32) +# define CDS_OS_TYPE CDS_OS_WIN32 +# define CDS_OS__NAME "Win32" +# define CDS_OS__NICK "Win32" +# endif +#endif + #include #define alignof __alignof__ diff --git a/cds/compiler/gcc/compiler_macro.h b/cds/compiler/gcc/compiler_macro.h index 5fa4d90d..6afefe51 100644 --- a/cds/compiler/gcc/compiler_macro.h +++ b/cds/compiler/gcc/compiler_macro.h @@ -4,57 +4,59 @@ #define CDSLIB_COMPILER_GCC_COMPILER_MACRO_H // OS interface && OS name -#if defined( __linux__ ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_LINUX -# define CDS_OS__NAME "linux" -# define CDS_OS__NICK "linux" -#elif defined( __sun__ ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_SUN_SOLARIS -# define CDS_OS__NAME "Sun Solaris" -# define CDS_OS__NICK "sun" -#elif defined( __hpux__ ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_HPUX -# define CDS_OS__NAME "HP-UX" -# define CDS_OS__NICK "hpux" -#elif defined( _AIX ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_AIX -# define CDS_OS__NAME "AIX" -# define CDS_OS__NICK "aix" -#elif defined( __FreeBSD__ ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_FREE_BSD -# define CDS_OS__NAME "FreeBSD" -# define CDS_OS__NICK "freebsd" -#elif defined( __OpenBSD__ ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_OPEN_BSD -# define CDS_OS__NAME "OpenBSD" -# define CDS_OS__NICK "openbsd" -#elif defined( __NetBSD__ ) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_NET_BSD -# define CDS_OS__NAME "NetBSD" -# define CDS_OS__NICK "netbsd" -#elif defined(__MINGW32__) || defined( __MINGW64__) -# define CDS_OS_INTERFACE CDS_OSI_WINDOWS -# define CDS_OS_TYPE CDS_OS_MINGW -# define CDS_OS__NAME "MinGW" -# define CDS_OS__NICK "mingw" -#elif defined(__MACH__) -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_OSX -# define CDS_OS__NAME "OS X" -# define CDS_OS__NICK "osx" -#else -# define CDS_OS_INTERFACE CDS_OSI_UNIX -# define CDS_OS_TYPE CDS_OS_PTHREAD -# define CDS_OS__NAME "pthread" -# define CDS_OS__NICK "pthread" -#endif +#ifndef CDS_OS_TYPE +# if defined( __linux__ ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_LINUX +# define CDS_OS__NAME "linux" +# define CDS_OS__NICK "linux" +# elif defined( __sun__ ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_SUN_SOLARIS +# define CDS_OS__NAME "Sun Solaris" +# define CDS_OS__NICK "sun" +# elif defined( __hpux__ ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_HPUX +# define CDS_OS__NAME "HP-UX" +# define CDS_OS__NICK "hpux" +# elif defined( _AIX ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_AIX +# define CDS_OS__NAME "AIX" +# define CDS_OS__NICK "aix" +# elif defined( __FreeBSD__ ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_FREE_BSD +# define CDS_OS__NAME "FreeBSD" +# define CDS_OS__NICK "freebsd" +# elif defined( __OpenBSD__ ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_OPEN_BSD +# define CDS_OS__NAME "OpenBSD" +# define CDS_OS__NICK "openbsd" +# elif defined( __NetBSD__ ) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_NET_BSD +# define CDS_OS__NAME "NetBSD" +# define CDS_OS__NICK "netbsd" +# elif defined(__MINGW32__) || defined( __MINGW64__) +# define CDS_OS_INTERFACE CDS_OSI_WINDOWS +# define CDS_OS_TYPE CDS_OS_MINGW +# define CDS_OS__NAME "MinGW" +# define CDS_OS__NICK "mingw" +# elif defined(__MACH__) +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_OSX +# define CDS_OS__NAME "OS X" +# define CDS_OS__NICK "osx" +# else +# define CDS_OS_INTERFACE CDS_OSI_UNIX +# define CDS_OS_TYPE CDS_OS_PTHREAD +# define CDS_OS__NAME "pthread" +# define CDS_OS__NICK "pthread" +# endif +#endif // #ifndef CDS_OS_TYPE // Processor architecture diff --git a/cds/details/defs.h b/cds/details/defs.h index faa39be4..df068b8f 100644 --- a/cds/details/defs.h +++ b/cds/details/defs.h @@ -302,6 +302,8 @@ namespace cds {} #if defined(_MSC_VER) # if defined(__ICL) || defined(__INTEL_COMPILER) # define CDS_COMPILER CDS_COMPILER_INTEL +# elif defined(__clang__) +# define CDS_COMPILER CDS_COMPILER_CLANG # else # define CDS_COMPILER CDS_COMPILER_MSVC # endif diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln index 5b7477b7..9680bb49 100644 --- a/projects/Win/vc14/cds.sln +++ b/projects/Win/vc14/cds.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.40629.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cds", "cds.vcxproj", "{408FE9BC-44F0-4E6A-89FA-D6F952584239}" EndProject @@ -199,6 +199,8 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Debug-clang-3.7|Win32 = Debug-clang-3.7|Win32 + Debug-clang-3.7|x64 = Debug-clang-3.7|x64 DebugVLD|Win32 = DebugVLD|Win32 DebugVLD|x64 = DebugVLD|x64 ICL-Debug|Win32 = ICL-Debug|Win32 @@ -213,6 +215,10 @@ Global {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug|Win32.Build.0 = Debug|Win32 {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug|x64.ActiveCfg = Debug|x64 {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug|x64.Build.0 = Debug|x64 + {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {408FE9BC-44F0-4E6A-89FA-D6F952584239}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {408FE9BC-44F0-4E6A-89FA-D6F952584239}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {408FE9BC-44F0-4E6A-89FA-D6F952584239}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {408FE9BC-44F0-4E6A-89FA-D6F952584239}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -233,6 +239,10 @@ Global {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug|Win32.Build.0 = Debug|Win32 {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug|x64.ActiveCfg = Debug|x64 {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug|x64.Build.0 = Debug|x64 + {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {61179F2F-07E1-490D-B64D-D85A90B6EF81}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {61179F2F-07E1-490D-B64D-D85A90B6EF81}.DebugVLD|Win32.ActiveCfg = Debug|Win32 {61179F2F-07E1-490D-B64D-D85A90B6EF81}.DebugVLD|Win32.Build.0 = Debug|Win32 {61179F2F-07E1-490D-B64D-D85A90B6EF81}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -253,6 +263,10 @@ Global {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug|Win32.Build.0 = Debug|Win32 {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug|x64.ActiveCfg = Debug|x64 {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug|x64.Build.0 = Debug|x64 + {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.DebugVLD|Win32.ActiveCfg = Debug|Win32 {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.DebugVLD|Win32.Build.0 = Debug|Win32 {77350FDC-9E51-438B-9A8F-D2FEA11D46B2}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -273,6 +287,10 @@ Global {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug|Win32.Build.0 = Debug|Win32 {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug|x64.ActiveCfg = Debug|x64 {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug|x64.Build.0 = Debug|x64 + {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.DebugVLD|Win32.ActiveCfg = Debug|Win32 {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.DebugVLD|Win32.Build.0 = Debug|Win32 {6C15AF8A-4A99-49F9-BCF0-1BF36771099A}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -293,6 +311,10 @@ Global {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug|Win32.Build.0 = Debug|Win32 {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug|x64.ActiveCfg = Debug|x64 {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug|x64.Build.0 = Debug|x64 + {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.DebugVLD|Win32.ActiveCfg = Debug|Win32 {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.DebugVLD|Win32.Build.0 = Debug|Win32 {E29DE1F7-AE8D-4AE6-98B1-147E5103D974}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -313,6 +335,10 @@ Global {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug|Win32.Build.0 = Debug|Win32 {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug|x64.ActiveCfg = Debug|x64 {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug|x64.Build.0 = Debug|x64 + {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {CD0BC7FC-9BFF-40B0-8E66-99D244A8A026}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -333,6 +359,10 @@ Global {282E9A9A-386A-40FB-A483-994BACE24830}.Debug|Win32.Build.0 = Debug|Win32 {282E9A9A-386A-40FB-A483-994BACE24830}.Debug|x64.ActiveCfg = Debug|x64 {282E9A9A-386A-40FB-A483-994BACE24830}.Debug|x64.Build.0 = Debug|x64 + {282E9A9A-386A-40FB-A483-994BACE24830}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {282E9A9A-386A-40FB-A483-994BACE24830}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {282E9A9A-386A-40FB-A483-994BACE24830}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {282E9A9A-386A-40FB-A483-994BACE24830}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {282E9A9A-386A-40FB-A483-994BACE24830}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {282E9A9A-386A-40FB-A483-994BACE24830}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {282E9A9A-386A-40FB-A483-994BACE24830}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -353,6 +383,10 @@ Global {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug|Win32.Build.0 = Debug|Win32 {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug|x64.ActiveCfg = Debug|x64 {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug|x64.Build.0 = Debug|x64 + {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {C5E76975-B87B-4B9E-8596-B01DDA683FCA}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -373,6 +407,10 @@ Global {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug|Win32.Build.0 = Debug|Win32 {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug|x64.ActiveCfg = Debug|x64 {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug|x64.Build.0 = Debug|x64 + {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {EFCBBADE-2CF4-4E2B-ADB2-98C8D139E805}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -393,6 +431,10 @@ Global {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug|Win32.Build.0 = Debug|Win32 {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug|x64.ActiveCfg = Debug|x64 {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug|x64.Build.0 = Debug|x64 + {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {3C598F96-FB84-4D42-9B43-F697F53B0221}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {3C598F96-FB84-4D42-9B43-F697F53B0221}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {3C598F96-FB84-4D42-9B43-F697F53B0221}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {3C598F96-FB84-4D42-9B43-F697F53B0221}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -413,6 +455,10 @@ Global {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug|Win32.Build.0 = Debug|Win32 {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug|x64.ActiveCfg = Debug|x64 {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug|x64.Build.0 = Debug|x64 + {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {BA2A9239-0299-4069-BB0E-16DACE87ADE0}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -432,6 +478,10 @@ Global {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug|Win32.Build.0 = Debug|Win32 {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug|x64.ActiveCfg = Debug|x64 {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug|x64.Build.0 = Debug|x64 + {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {CA25BDBF-B354-4597-B6D2-220ABBB0D2F4}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -451,6 +501,10 @@ Global {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug|Win32.Build.0 = Debug|Win32 {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug|x64.ActiveCfg = Debug|x64 {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug|x64.Build.0 = Debug|x64 + {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {AF7B2253-2E6D-4992-94D9-4B3699C54929}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {AF7B2253-2E6D-4992-94D9-4B3699C54929}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {AF7B2253-2E6D-4992-94D9-4B3699C54929}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {AF7B2253-2E6D-4992-94D9-4B3699C54929}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -471,6 +525,10 @@ Global {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug|Win32.Build.0 = Debug|Win32 {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug|x64.ActiveCfg = Debug|x64 {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug|x64.Build.0 = Debug|x64 + {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {BA23811C-D4CB-4836-B2F3-6791BD6FFCD1}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -491,6 +549,10 @@ Global {90192F7D-5850-41DD-AE89-62D26B387162}.Debug|Win32.Build.0 = Debug|Win32 {90192F7D-5850-41DD-AE89-62D26B387162}.Debug|x64.ActiveCfg = Debug|x64 {90192F7D-5850-41DD-AE89-62D26B387162}.Debug|x64.Build.0 = Debug|x64 + {90192F7D-5850-41DD-AE89-62D26B387162}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {90192F7D-5850-41DD-AE89-62D26B387162}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {90192F7D-5850-41DD-AE89-62D26B387162}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {90192F7D-5850-41DD-AE89-62D26B387162}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {90192F7D-5850-41DD-AE89-62D26B387162}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {90192F7D-5850-41DD-AE89-62D26B387162}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {90192F7D-5850-41DD-AE89-62D26B387162}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -511,6 +573,10 @@ Global {33664E63-8D24-4FF4-A744-9782EB711509}.Debug|Win32.Build.0 = Debug|Win32 {33664E63-8D24-4FF4-A744-9782EB711509}.Debug|x64.ActiveCfg = Debug|x64 {33664E63-8D24-4FF4-A744-9782EB711509}.Debug|x64.Build.0 = Debug|x64 + {33664E63-8D24-4FF4-A744-9782EB711509}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {33664E63-8D24-4FF4-A744-9782EB711509}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {33664E63-8D24-4FF4-A744-9782EB711509}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {33664E63-8D24-4FF4-A744-9782EB711509}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {33664E63-8D24-4FF4-A744-9782EB711509}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {33664E63-8D24-4FF4-A744-9782EB711509}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {33664E63-8D24-4FF4-A744-9782EB711509}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -531,6 +597,10 @@ Global {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug|Win32.Build.0 = Debug|Win32 {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug|x64.ActiveCfg = Debug|x64 {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug|x64.Build.0 = Debug|x64 + {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {E5E9DB4A-7816-45D4-A116-6BBBA0EE8EE7}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -551,6 +621,10 @@ Global {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug|Win32.Build.0 = Debug|Win32 {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug|x64.ActiveCfg = Debug|x64 {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug|x64.Build.0 = Debug|x64 + {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -571,6 +645,10 @@ Global {A38E5597-6916-4480-A343-C9846EF544E4}.Debug|Win32.Build.0 = Debug|Win32 {A38E5597-6916-4480-A343-C9846EF544E4}.Debug|x64.ActiveCfg = Debug|x64 {A38E5597-6916-4480-A343-C9846EF544E4}.Debug|x64.Build.0 = Debug|x64 + {A38E5597-6916-4480-A343-C9846EF544E4}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {A38E5597-6916-4480-A343-C9846EF544E4}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {A38E5597-6916-4480-A343-C9846EF544E4}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {A38E5597-6916-4480-A343-C9846EF544E4}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {A38E5597-6916-4480-A343-C9846EF544E4}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {A38E5597-6916-4480-A343-C9846EF544E4}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {A38E5597-6916-4480-A343-C9846EF544E4}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -591,6 +669,10 @@ Global {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug|Win32.Build.0 = Debug|Win32 {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug|x64.ActiveCfg = Debug|x64 {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug|x64.Build.0 = Debug|x64 + {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {6F834EAD-7B94-4979-A0F1-A662E3D30145}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {6F834EAD-7B94-4979-A0F1-A662E3D30145}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {6F834EAD-7B94-4979-A0F1-A662E3D30145}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {6F834EAD-7B94-4979-A0F1-A662E3D30145}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -611,6 +693,10 @@ Global {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug|Win32.Build.0 = Debug|Win32 {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug|x64.ActiveCfg = Debug|x64 {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug|x64.Build.0 = Debug|x64 + {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {20B6C380-E96A-4CFF-BC17-D88AAE581919}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {20B6C380-E96A-4CFF-BC17-D88AAE581919}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {20B6C380-E96A-4CFF-BC17-D88AAE581919}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {20B6C380-E96A-4CFF-BC17-D88AAE581919}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -631,6 +717,10 @@ Global {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug|Win32.Build.0 = Debug|Win32 {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug|x64.ActiveCfg = Debug|x64 {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug|x64.Build.0 = Debug|x64 + {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {7521DD92-56FF-4ECA-93E5-CCE50862354B}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {7521DD92-56FF-4ECA-93E5-CCE50862354B}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {7521DD92-56FF-4ECA-93E5-CCE50862354B}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {7521DD92-56FF-4ECA-93E5-CCE50862354B}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -650,6 +740,10 @@ Global {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug|Win32.Build.0 = Debug|Win32 {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug|x64.ActiveCfg = Debug|x64 {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug|x64.Build.0 = Debug|x64 + {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {CA6F0834-0628-4CD7-8800-AEABCD636360}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {CA6F0834-0628-4CD7-8800-AEABCD636360}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {CA6F0834-0628-4CD7-8800-AEABCD636360}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {CA6F0834-0628-4CD7-8800-AEABCD636360}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 @@ -669,6 +763,10 @@ Global {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug|Win32.Build.0 = Debug|Win32 {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug|x64.ActiveCfg = Debug|x64 {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug|x64.Build.0 = Debug|x64 + {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug-clang-3.7|Win32.ActiveCfg = Debug-clang-3.7|Win32 + {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug-clang-3.7|Win32.Build.0 = Debug-clang-3.7|Win32 + {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug-clang-3.7|x64.ActiveCfg = Debug-clang-3.7|x64 + {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.Debug-clang-3.7|x64.Build.0 = Debug-clang-3.7|x64 {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 {DE256E91-EE96-412E-82EE-DD7BD1A1130D}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 diff --git a/projects/Win/vc14/cds.vcxproj b/projects/Win/vc14/cds.vcxproj index d980a020..20df773f 100644 --- a/projects/Win/vc14/cds.vcxproj +++ b/projects/Win/vc14/cds.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -46,6 +54,7 @@ {408FE9BC-44F0-4E6A-89FA-D6F952584239} cds Win32Proj + 8.1 @@ -70,6 +79,11 @@ MultiByte v140 + + DynamicLibrary + MultiByte + v140 + DynamicLibrary MultiByte @@ -97,6 +111,11 @@ MultiByte v140 + + DynamicLibrary + MultiByte + LLVM-vs2014 + DynamicLibrary MultiByte @@ -121,6 +140,10 @@ + + + + @@ -141,6 +164,10 @@ + + + + @@ -149,20 +176,28 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ true + true true true + true true $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ true + true true true + true true $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -199,16 +234,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -223,11 +264,13 @@ libcds-x86-vc$(PlatformToolset)_debug + libcds-x86-vc$(PlatformToolset)_debug libcds-x86-icl_debug libcds-x86-vc$(PlatformToolset)_debug libcds-x86-vc$(PlatformToolset) libcds-x86-icl libcds-amd64-vc$(PlatformToolset)_debug + libcds-amd64-vc$(PlatformToolset)_debug libcds-amd64-icl_debug libcds-amd64-vc$(PlatformToolset)_debug libcds-amd64-vc$(PlatformToolset) @@ -261,6 +304,34 @@ MachineX86 + + + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + NotUsing + Level3 + EditAndContinue + Cdecl + 4520 + + + $(OutDir)$(TargetName).dll + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Console + false + + + $(OutDir)$(TargetName).lib + MachineX86 + + /wd4512 /wd4127 %(AdditionalOptions) @@ -323,6 +394,41 @@ false + + + X64 + + + /wd4512 /wd4127 /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + NotUsing + Level4 + ProgramDatabase + Cdecl + 4520 + Sync + + + $(OutDir)$(TargetName).dll + %(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Console + false + + + $(OutDir)$(TargetName).lib + MachineX64 + + + false + + X64 diff --git a/projects/Win/vc14/hdr-test-deque.vcxproj b/projects/Win/vc14/hdr-test-deque.vcxproj index 909a83d4..6f2998b3 100644 --- a/projects/Win/vc14/hdr-test-deque.vcxproj +++ b/projects/Win/vc14/hdr-test-deque.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -70,6 +78,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +110,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -117,6 +135,9 @@ + + + @@ -132,6 +153,9 @@ + + + @@ -139,16 +163,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +205,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +235,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -235,6 +273,36 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + NotSet + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -297,6 +365,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-list.vcxproj b/projects/Win/vc14/hdr-test-list.vcxproj index 1ad0f176..8ac2a8e9 100644 --- a/projects/Win/vc14/hdr-test-list.vcxproj +++ b/projects/Win/vc14/hdr-test-list.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -132,6 +140,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -159,6 +172,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -179,6 +197,9 @@ + + + @@ -194,6 +215,9 @@ + + + @@ -201,16 +225,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -237,16 +267,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -261,8 +297,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -296,6 +334,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -356,6 +423,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-map.vcxproj b/projects/Win/vc14/hdr-test-map.vcxproj index 5d1b53cb..7274e7b7 100644 --- a/projects/Win/vc14/hdr-test-map.vcxproj +++ b/projects/Win/vc14/hdr-test-map.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -70,6 +78,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +110,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -117,6 +135,9 @@ + + + @@ -132,6 +153,9 @@ + + + @@ -139,16 +163,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +205,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +235,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -234,6 +272,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -294,6 +361,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-misc.vcxproj b/projects/Win/vc14/hdr-test-misc.vcxproj index ce309870..b6a178f9 100644 --- a/projects/Win/vc14/hdr-test-misc.vcxproj +++ b/projects/Win/vc14/hdr-test-misc.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -70,6 +78,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +110,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -117,6 +135,9 @@ + + + @@ -132,6 +153,9 @@ + + + @@ -139,16 +163,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +205,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +235,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -234,6 +272,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -294,6 +361,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-priority_queue.vcxproj b/projects/Win/vc14/hdr-test-priority_queue.vcxproj index 2f4e2f2f..674e22cd 100644 --- a/projects/Win/vc14/hdr-test-priority_queue.vcxproj +++ b/projects/Win/vc14/hdr-test-priority_queue.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -84,6 +92,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -111,6 +124,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -131,6 +149,9 @@ + + + @@ -146,6 +167,9 @@ + + + @@ -153,16 +177,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -189,16 +219,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -213,8 +249,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -248,6 +286,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -308,6 +375,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-queue.vcxproj b/projects/Win/vc14/hdr-test-queue.vcxproj index d7874c39..d0e52f15 100644 --- a/projects/Win/vc14/hdr-test-queue.vcxproj +++ b/projects/Win/vc14/hdr-test-queue.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -70,6 +78,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +110,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -117,6 +135,9 @@ + + + @@ -132,6 +153,9 @@ + + + @@ -139,16 +163,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +205,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +235,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -234,6 +272,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -294,6 +361,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-set.vcxproj b/projects/Win/vc14/hdr-test-set.vcxproj index 74bc4065..ae12d7b5 100644 --- a/projects/Win/vc14/hdr-test-set.vcxproj +++ b/projects/Win/vc14/hdr-test-set.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -70,6 +78,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +110,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -117,6 +135,9 @@ + + + @@ -132,6 +153,9 @@ + + + @@ -139,16 +163,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +205,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +235,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -234,6 +272,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -294,6 +361,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-stack.vcxproj b/projects/Win/vc14/hdr-test-stack.vcxproj index e8da738f..0cc7f23d 100644 --- a/projects/Win/vc14/hdr-test-stack.vcxproj +++ b/projects/Win/vc14/hdr-test-stack.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -46,6 +54,7 @@ {E3F2927A-6ED6-4B18-BDE6-B3B760E1AF18} hdrteststack Win32Proj + 8.1 @@ -70,6 +79,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +111,11 @@ MultiByte v140 + + Application + MultiByte + LLVM-vs2014 + Application MultiByte @@ -117,6 +136,9 @@ + + + @@ -132,6 +154,9 @@ + + + @@ -139,16 +164,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +206,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +236,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -234,6 +273,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -294,6 +362,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-striped-set.vcxproj b/projects/Win/vc14/hdr-test-striped-set.vcxproj index d7e2bde1..3fb2d272 100644 --- a/projects/Win/vc14/hdr-test-striped-set.vcxproj +++ b/projects/Win/vc14/hdr-test-striped-set.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -122,6 +130,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -149,6 +162,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -169,6 +187,9 @@ + + + @@ -184,6 +205,9 @@ + + + @@ -191,16 +215,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -227,16 +257,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -251,8 +287,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -286,6 +324,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions);_SCL_SECURE_NO_WARNINGS + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -346,6 +413,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;%(PreprocessorDefinitions);_SCL_SECURE_NO_WARNINGS + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/hdr-test-tree.vcxproj b/projects/Win/vc14/hdr-test-tree.vcxproj index 8df8e8e2..db0ad6ce 100644 --- a/projects/Win/vc14/hdr-test-tree.vcxproj +++ b/projects/Win/vc14/hdr-test-tree.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -70,6 +78,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -97,6 +110,11 @@ MultiByte v140 + + Application + MultiByte + v140 + Application MultiByte @@ -117,6 +135,9 @@ + + + @@ -132,6 +153,9 @@ + + + @@ -139,16 +163,22 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ @@ -175,16 +205,22 @@ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -199,8 +235,10 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -234,6 +272,35 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -294,6 +361,38 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\test-hdr;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;_SCL_SECURE=0;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + Cdecl + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + false + + + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-map-delodd.vcxproj b/projects/Win/vc14/unit-map-delodd.vcxproj index 80ea72f6..d0faea56 100644 --- a/projects/Win/vc14/unit-map-delodd.vcxproj +++ b/projects/Win/vc14/unit-map-delodd.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -89,6 +97,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -116,6 +129,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -138,6 +156,9 @@ + + + @@ -153,6 +174,9 @@ + + + @@ -163,21 +187,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -193,21 +223,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -223,9 +259,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -254,6 +292,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -332,6 +395,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-map-find.vcxproj b/projects/Win/vc14/unit-map-find.vcxproj index ff65c25d..718786c5 100644 --- a/projects/Win/vc14/unit-map-find.vcxproj +++ b/projects/Win/vc14/unit-map-find.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -102,6 +110,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -129,6 +142,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -151,6 +169,9 @@ + + + @@ -166,6 +187,9 @@ + + + @@ -176,21 +200,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -206,21 +236,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -236,9 +272,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -267,6 +305,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4503;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -346,6 +409,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4503;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-map-insdel-item.vcxproj b/projects/Win/vc14/unit-map-insdel-item.vcxproj index 9dc718c6..b5ef14d9 100644 --- a/projects/Win/vc14/unit-map-insdel-item.vcxproj +++ b/projects/Win/vc14/unit-map-insdel-item.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -89,6 +97,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -116,6 +129,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -138,6 +156,9 @@ + + + @@ -153,6 +174,9 @@ + + + @@ -163,21 +187,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -193,21 +223,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -223,9 +259,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -254,6 +292,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520;4503 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -333,6 +396,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520;4503 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-map-insdel.vcxproj b/projects/Win/vc14/unit-map-insdel.vcxproj index a75db9ae..8918d336 100644 --- a/projects/Win/vc14/unit-map-insdel.vcxproj +++ b/projects/Win/vc14/unit-map-insdel.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -101,6 +109,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -128,6 +141,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -150,6 +168,9 @@ + + + @@ -165,6 +186,9 @@ + + + @@ -175,21 +199,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -205,21 +235,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -235,9 +271,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -269,6 +307,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4503;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -348,6 +411,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4503;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-map-insdelfind.vcxproj b/projects/Win/vc14/unit-map-insdelfind.vcxproj index 051eef1d..1e1da3e0 100644 --- a/projects/Win/vc14/unit-map-insdelfind.vcxproj +++ b/projects/Win/vc14/unit-map-insdelfind.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -80,6 +88,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -107,6 +120,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -129,6 +147,9 @@ + + + @@ -144,6 +165,9 @@ + + + @@ -154,21 +178,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -184,21 +214,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -214,9 +250,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -245,6 +283,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4503;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -324,6 +387,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;NOMINMAX;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4503;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-misc.vcxproj b/projects/Win/vc14/unit-misc.vcxproj index 67ca5220..52111dd7 100644 --- a/projects/Win/vc14/unit-misc.vcxproj +++ b/projects/Win/vc14/unit-misc.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -65,6 +73,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -92,6 +105,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -114,6 +132,9 @@ + + + @@ -129,6 +150,9 @@ + + + @@ -139,21 +163,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -169,21 +199,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -199,9 +235,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -230,6 +268,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -308,6 +371,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-pqueue.vcxproj b/projects/Win/vc14/unit-pqueue.vcxproj index 34891ed8..69269675 100644 --- a/projects/Win/vc14/unit-pqueue.vcxproj +++ b/projects/Win/vc14/unit-pqueue.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -78,6 +86,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -105,6 +118,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -127,6 +145,9 @@ + + + @@ -142,6 +163,9 @@ + + + @@ -152,21 +176,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -182,21 +212,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -212,9 +248,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -243,6 +281,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -321,6 +384,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-prerequisites.vcxproj b/projects/Win/vc14/unit-prerequisites.vcxproj index 1de53627..56abb15d 100644 --- a/projects/Win/vc14/unit-prerequisites.vcxproj +++ b/projects/Win/vc14/unit-prerequisites.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -65,6 +73,11 @@ Unicode v140 + + StaticLibrary + Unicode + v140 + StaticLibrary Unicode @@ -92,6 +105,11 @@ Unicode v140 + + StaticLibrary + Unicode + v140 + StaticLibrary Unicode @@ -114,6 +132,9 @@ + + + @@ -129,6 +150,9 @@ + + + @@ -139,15 +163,19 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -159,21 +187,27 @@ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -189,9 +223,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -214,6 +250,25 @@ $(TargetPath) + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + BOOST_ERROR_CODE_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + $(TargetPath) + + /bigobj %(AdditionalOptions) @@ -274,6 +329,28 @@ $(TargetPath) + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + BOOST_ERROR_CODE_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + $(TargetPath) + + X64 @@ -426,11 +503,13 @@ Level2 + Level2 Level2 Level2 Level2 Level2 Level2 + Level2 Level2 Level2 Level2 @@ -442,9 +521,11 @@ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -457,21 +538,27 @@ Copy test configurations + Copy test configurations Copy test configurations Copy test configurations copy %(FullPath) $(TargetDir)\*.* + copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* $(TargetDir)\test-debug.conf;%(Outputs) + $(TargetDir)\test-debug.conf;%(Outputs) $(TargetDir)\test-debug.conf;%(Outputs) $(TargetDir)\test-debug.conf;%(Outputs) Copy test configurations + Copy test configurations Copy test configurations Copy test configurations copy %(FullPath) $(TargetDir)\*.* + copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* $(TargetDir)\test-debug.conf;%(Outputs) + $(TargetDir)\test-debug.conf;%(Outputs) $(TargetDir)\test-debug.conf;%(Outputs) $(TargetDir)\test-debug.conf;%(Outputs) Copy test configurations @@ -489,21 +576,27 @@ Copy test configurations + Copy test configurations Copy test configurations Copy test configurations copy %(FullPath) $(TargetDir)\*.* + copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* $(TargetDir)\test-express.conf;%(Outputs) + $(TargetDir)\test-express.conf;%(Outputs) $(TargetDir)\test-express.conf;%(Outputs) $(TargetDir)\test-express.conf;%(Outputs) Copy test configurations + Copy test configurations Copy test configurations Copy test configurations copy %(FullPath) $(TargetDir)\*.* + copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* $(TargetDir)\test-express.conf;%(Outputs) + $(TargetDir)\test-express.conf;%(Outputs) $(TargetDir)\test-express.conf;%(Outputs) $(TargetDir)\test-express.conf;%(Outputs) Copy test configurations @@ -521,21 +614,27 @@ Copy test configurations + Copy test configurations Copy test configurations Copy test configurations copy %(FullPath) $(TargetDir)\*.* + copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* $(TargetDir)\test.conf;%(Outputs) + $(TargetDir)\test.conf;%(Outputs) $(TargetDir)\test.conf;%(Outputs) $(TargetDir)\test.conf;%(Outputs) Copy test configurations + Copy test configurations Copy test configurations Copy test configurations copy %(FullPath) $(TargetDir)\*.* + copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* copy %(FullPath) $(TargetDir)\*.* $(TargetDir)\test.conf;%(Outputs) + $(TargetDir)\test.conf;%(Outputs) $(TargetDir)\test.conf;%(Outputs) $(TargetDir)\test.conf;%(Outputs) Copy test configurations @@ -553,21 +652,27 @@ Build text dictionary + Build text dictionary Build text dictionary Build text dictionary cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt + cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt $(TargetDir)\dictionary.txt;%(Outputs) + $(TargetDir)\dictionary.txt;%(Outputs) $(TargetDir)\dictionary.txt;%(Outputs) $(TargetDir)\dictionary.txt;%(Outputs) Build text dictionary + Build text dictionary Build text dictionary Build text dictionary cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt + cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt cd %(RootDir)%(Directory) && perl -X split.pl && copy %(RootDir)%(Directory)\dictionary.txt $(TargetDir)\dictionary.txt $(TargetDir)\dictionary.txt;%(Outputs) + $(TargetDir)\dictionary.txt;%(Outputs) $(TargetDir)\dictionary.txt;%(Outputs) $(TargetDir)\dictionary.txt;%(Outputs) Build text dictionary diff --git a/projects/Win/vc14/unit-queue.vcxproj b/projects/Win/vc14/unit-queue.vcxproj index 80ddf183..ee9fba8e 100644 --- a/projects/Win/vc14/unit-queue.vcxproj +++ b/projects/Win/vc14/unit-queue.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -65,6 +73,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -92,6 +105,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -114,6 +132,9 @@ + + + @@ -129,6 +150,9 @@ + + + @@ -139,21 +163,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -169,21 +199,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -199,9 +235,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -230,6 +268,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -308,6 +371,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-set-delodd.vcxproj b/projects/Win/vc14/unit-set-delodd.vcxproj index 67ef9ca5..1b970c62 100644 --- a/projects/Win/vc14/unit-set-delodd.vcxproj +++ b/projects/Win/vc14/unit-set-delodd.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -76,6 +84,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -103,6 +116,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -125,6 +143,9 @@ + + + @@ -140,6 +161,9 @@ + + + @@ -150,21 +174,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -180,21 +210,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -210,9 +246,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -241,6 +279,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -319,6 +382,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-set-insdel.vcxproj b/projects/Win/vc14/unit-set-insdel.vcxproj index 3fde4fca..55b06066 100644 --- a/projects/Win/vc14/unit-set-insdel.vcxproj +++ b/projects/Win/vc14/unit-set-insdel.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -88,6 +96,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -115,6 +128,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -137,6 +155,9 @@ + + + @@ -152,6 +173,9 @@ + + + @@ -162,21 +186,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -192,21 +222,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -222,9 +258,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -253,6 +291,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4503;4520;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -332,6 +395,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4503;4520;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-set-insdelfind.vcxproj b/projects/Win/vc14/unit-set-insdelfind.vcxproj index e53ada03..25a866fe 100644 --- a/projects/Win/vc14/unit-set-insdelfind.vcxproj +++ b/projects/Win/vc14/unit-set-insdelfind.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -79,6 +87,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -106,6 +119,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -128,6 +146,9 @@ + + + @@ -143,6 +164,9 @@ + + + @@ -153,21 +177,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -183,21 +213,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -213,9 +249,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -244,6 +282,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4503;4520;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -323,6 +386,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4503;4520;%(DisableSpecificWarnings) + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/projects/Win/vc14/unit-stack.vcxproj b/projects/Win/vc14/unit-stack.vcxproj index 66a54358..be1ab7a2 100644 --- a/projects/Win/vc14/unit-stack.vcxproj +++ b/projects/Win/vc14/unit-stack.vcxproj @@ -1,6 +1,14 @@  + + Debug-clang-3.7 + Win32 + + + Debug-clang-3.7 + x64 + DebugVLD Win32 @@ -65,6 +73,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -92,6 +105,11 @@ Unicode v140 + + Application + Unicode + v140 + Application Unicode @@ -114,6 +132,9 @@ + + + @@ -129,6 +150,9 @@ + + + @@ -139,21 +163,27 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)-icl\$(Platform)\ $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)-icl\$(Platform)\$(ProjectName)\$(Configuration)\ $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ false + false false false $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ @@ -169,21 +199,27 @@ false false AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset AllRules.ruleset + + AllRules.ruleset @@ -199,9 +235,11 @@ $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d + $(ProjectName)_d $(ProjectName)_d $(ProjectName)_d @@ -230,6 +268,31 @@ MultiplyDefinedSymbolOnly + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + MultiplyDefinedSymbolOnly + + /bigobj %(AdditionalOptions) @@ -308,6 +371,34 @@ MultiplyDefinedSymbolOnly + + + X64 + + + /bigobj /Zc:inline %(AdditionalOptions) + Disabled + $(SolutionDir)..\..\..;$(SolutionDir)..\..\..\tests\unit;$(SolutionDir)..\..\..\tests;$(BOOST_PATH);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_SCL_SECURE=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + 4520 + + + unit-prerequisites_d.lib;%(AdditionalDependencies) + $(TargetPath) + $(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;$(OutDir);%(AdditionalLibraryDirectories) + true + Console + MachineX64 + MultiplyDefinedSymbolOnly + + X64 diff --git a/src/dllmain.cpp b/src/dllmain.cpp index 5d1a8f85..fbfddb01 100644 --- a/src/dllmain.cpp +++ b/src/dllmain.cpp @@ -150,7 +150,7 @@ static void discover_topology() return; } -namespace cds { namespace OS { namespace Win32 { +namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 { unsigned int topology::processor_count() { return s_nProcessorCount; @@ -171,7 +171,7 @@ namespace cds { namespace OS { namespace Win32 { s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) GetProcAddress( GetModuleHandle("ntdll"), "NtGetCurrentProcessorNumber" ); } - namespace cds { namespace OS { namespace Win32 { + namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 { unsigned int topology::current_processor() { if ( s_fnGetCurrentProcessorNumber != nullptr ) -- 2.34.1