diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3a2685c5a..971004f51 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 "8790" + #define REVISION_NR "8791" #endif // __REVISION_NR_H__ diff --git a/win/VC100/tbb.vcxproj b/win/VC100/tbb.vcxproj index bba9e8fa1..cfea8cdd4 100644 --- a/win/VC100/tbb.vcxproj +++ b/win/VC100/tbb.vcxproj @@ -288,19 +288,19 @@ true building atomic_support.obj - ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm + ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm - ..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) + tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) true building atomic_support.obj - ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm + ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm - ..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) + tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) true building atomic_support.obj - ml64 /Fo..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm + ml64 /Fo"tbb__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm - ..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) + tbb__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) /coff /Zi diff --git a/win/VC100/tbbmalloc.vcxproj b/win/VC100/tbbmalloc.vcxproj index 6adbf0bea..27a84b024 100644 --- a/win/VC100/tbbmalloc.vcxproj +++ b/win/VC100/tbbmalloc.vcxproj @@ -289,19 +289,19 @@ true building atomic_support.obj - ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm + ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm - ..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) + tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) true building atomic_support.obj - ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm + ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm - ..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) + tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) true building atomic_support.obj - ml64 /Fo"..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm + ml64 /Fo"tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm - ..\..\bin\$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) + tbbmalloc__$(Platform)_$(Configuration)\atomic_support.obj;%(Outputs) diff --git a/win/VC80/tbb.vcproj b/win/VC80/tbb.vcproj index 5ee57d580..1e8810219 100644 --- a/win/VC80/tbb.vcproj +++ b/win/VC80/tbb.vcproj @@ -544,8 +544,8 @@ diff --git a/win/VC80/tbbmalloc.vcproj b/win/VC80/tbbmalloc.vcproj index fe6f943c4..5847b37ab 100644 --- a/win/VC80/tbbmalloc.vcproj +++ b/win/VC80/tbbmalloc.vcproj @@ -604,8 +604,8 @@ diff --git a/win/VC90/tbb.vcproj b/win/VC90/tbb.vcproj index 2fd53e2c4..5da97fc16 100644 --- a/win/VC90/tbb.vcproj +++ b/win/VC90/tbb.vcproj @@ -585,8 +585,8 @@ diff --git a/win/VC90/tbbmalloc.vcproj b/win/VC90/tbbmalloc.vcproj index 2ad796961..31c58952f 100644 --- a/win/VC90/tbbmalloc.vcproj +++ b/win/VC90/tbbmalloc.vcproj @@ -553,8 +553,8 @@