From 16f2ae5f573f2f02726c59ce86db7e63a34c42f5 Mon Sep 17 00:00:00 2001
From: Vahagn Khachatryan <vahagn.khachatryan@gmail.com>
Date: Fri, 15 Feb 2013 23:47:49 +0400
Subject: [PATCH] tbb_test configured to compile with vc2012.

---
 .gitignore                |  1 +
 tbb_test/main.cpp         |  2 +-
 tbb_test/tbb_test.bat     | 37 +++++++++++++++++++++++++++++++++++++
 tbb_test/tbb_test.sln     | 10 ++--------
 tbb_test/tbb_test.vcxproj |  4 ++++
 5 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 tbb_test/tbb_test.bat

diff --git a/.gitignore b/.gitignore
index 9de94ef..1ad8135 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@
 Debug
 Release
 ipch
+x64
 
diff --git a/tbb_test/main.cpp b/tbb_test/main.cpp
index 6c52903..290c50f 100644
--- a/tbb_test/main.cpp
+++ b/tbb_test/main.cpp
@@ -115,7 +115,7 @@ int test_flowgraph()
 int main ( void )
 {try{
 
-	//test();
+	test();
 
 	test_copy_tracker();
 	return 0;
diff --git a/tbb_test/tbb_test.bat b/tbb_test/tbb_test.bat
new file mode 100644
index 0000000..691ac9f
--- /dev/null
+++ b/tbb_test/tbb_test.bat
@@ -0,0 +1,37 @@
+cd "%~dp0"
+
+call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64
+
+set SRCDIR=%CD%\src
+
+set BOOST=C:\Users\Vahagnk\src\boost_1_53_0
+set BOOST_INCLUDE=%BOOST%
+set BOOST_LIB64=%BOOST%\stage\win64_vc12\lib
+
+set GTEST=C:\Users\Vahagnk\src\gtest-1.6.0
+set GTEST_INCLUDE=%GTEST%\include
+set GTEST_LIB64=%GTEST%\build_x64_vc12
+
+set ZLIB=C:\Users\Vahagnk\src\zlib-1.2.7
+set ZLIB_INCLUDE=%ZLIB%
+set ZLIB_LIB64=%ZLIB%\build_x64_vc12
+
+set LIBPNG=C:\Users\Vahagnk\src\libpng-1.5.10
+set LIBPNG_INCLUDE=%LIBPNG%
+set LIBPNG_LIB64=%LIBPNG%\build_x64_vc10
+
+set TBB=C:\Users\Vahagnk\src\tbb41_20121003oss
+set TBB_INCLUDE=%TBB%\include
+set TBB_LIB64=%TBB%\lib\intel64\vc11
+set TBB_BIN64=%TBB%\bin\intel64\vc11
+
+set SRCDIR="%~dp0\src"
+
+set CL=/I%BOOST_INLCUDE% /I%TBB_INLCUDE% /I%GTEST_INCLUDE% /I%LIBPNG_INCLUDE% /I%ZLIB_INCLUDE% /I%QT_INCLUDE% /I%SRCDIR% /D_CRT_SECURE_NO_WARNINGS /DTEST_VERSION=\"vahagn_experimental\"
+set LINK=/INCREMENTAL:NO
+
+set PATH=%TBB_BIN64%;%PATH%
+
+start devenv.exe %~n0.sln
+
+
diff --git a/tbb_test/tbb_test.sln b/tbb_test/tbb_test.sln
index 221a93b..165382f 100644
--- a/tbb_test/tbb_test.sln
+++ b/tbb_test/tbb_test.sln
@@ -1,22 +1,16 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb_test", "tbb_test.vcxproj", "{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Debug|Win32.Build.0 = Debug|Win32
 		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Debug|x64.ActiveCfg = Debug|x64
 		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Debug|x64.Build.0 = Debug|x64
-		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Release|Win32.ActiveCfg = Release|Win32
-		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Release|Win32.Build.0 = Release|Win32
 		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Release|x64.ActiveCfg = Release|x64
 		{5771BE40-BCC1-4DBB-9E0B-9B0FEF85927E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
diff --git a/tbb_test/tbb_test.vcxproj b/tbb_test/tbb_test.vcxproj
index 88cd71a..0e080f8 100644
--- a/tbb_test/tbb_test.vcxproj
+++ b/tbb_test/tbb_test.vcxproj
@@ -28,23 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">