diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index bf09d4b41..e12bc6b1b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11164" + #define REVISION_NR "11165" #endif // __REVISION_NR_H__ diff --git a/win/VC100/tbb.vcxproj b/win/VC100/tbb.vcxproj index b76c1c89a..bafaca65d 100644 --- a/win/VC100/tbb.vcxproj +++ b/win/VC100/tbb.vcxproj @@ -127,7 +127,7 @@ /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions) Disabled - ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true EnableFastChecks @@ -154,7 +154,7 @@ /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions) Disabled - ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true EnableFastChecks @@ -178,7 +178,7 @@ /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /Oy- /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions) - ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -204,7 +204,7 @@ /c /MD /O2 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions) - ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -228,7 +228,7 @@ /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions) Disabled - ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true EnableFastChecks @@ -255,7 +255,7 @@ /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W3 /I../../src /I../../include %(AdditionalOptions) Disabled - ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true EnableFastChecks @@ -383,6 +383,12 @@ /I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions) /I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions) /I../../src /I../../include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions) + ..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) + ..\..\dep\tbb\src;..\..\dep\tbb\include;..\..\dep\tbb\build\vsproject;%(AdditionalIncludeDirectories) diff --git a/win/VC80/mangosd.vcproj b/win/VC80/mangosd.vcproj index 8eaa70cd9..90dffb2d4 100644 --- a/win/VC80/mangosd.vcproj +++ b/win/VC80/mangosd.vcproj @@ -1,7 +1,7 @@ diff --git a/win/VC80/tbbmalloc.vcproj b/win/VC80/tbbmalloc.vcproj index 5847b37ab..19af6c9cb 100644 --- a/win/VC80/tbbmalloc.vcproj +++ b/win/VC80/tbbmalloc.vcproj @@ -1048,6 +1048,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/win/VC90/tbb.vcproj b/win/VC90/tbb.vcproj index 5da97fc16..fcd855f92 100644 --- a/win/VC90/tbb.vcproj +++ b/win/VC90/tbb.vcproj @@ -51,7 +51,7 @@ Name="VCCLCompilerTool" AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include" Optimization="0" - AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject" + AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include" PreprocessorDefinitions="" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" AdditionalOptions=" /c /MDd /Od /Ob0 /Zi /EHsc /GR /Zc:forScope /Zc:wchar_t /DTBB_USE_DEBUG /DDO_ITT_ANNOTATE /D_USE_RTM_VERSION /GS- /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 /D__TBB_BUILD=1 /W4 /I../../src /I../../include" Optimization="0" - AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject" + AdditionalIncludeDirectories="..\..\dep\tbb\include;..\..\dep\tbb\src;..\..\dep\tbb\build;..\..\dep\tbb\build\vsproject;..\..\dep\tbb\src\rml\include" PreprocessorDefinitions="" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -215,7 +215,7 @@ diff --git a/win/VC90/tbbmalloc.vcproj b/win/VC90/tbbmalloc.vcproj index 31c58952f..5a208de99 100644 --- a/win/VC90/tbbmalloc.vcproj +++ b/win/VC90/tbbmalloc.vcproj @@ -1043,6 +1043,54 @@ + + + + + + + + + + + + + + + + + +