]> OCCT Git - occt-wok.git/commitdiff
projects / occt-wok.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fc04836)
OCCTR22193 Improve management of dependency on Intel TBB on Windows
authorinv <inv@opencascade.com>
Mon, 24 Jan 2011 10:21:39 +0000 (10:21 +0000)
committerinv <inv@opencascade.com>
Mon, 24 Jan 2011 10:21:39 +0000 (10:21 +0000)
12 files changed:
src/WOKTclLib/template.vc10 patch | blob | blame | history
src/WOKTclLib/template.vc10_64 patch | blob | blame | history
src/WOKTclLib/template.vc10x patch | blob | blame | history
src/WOKTclLib/template.vc10x_64 patch | blob | blame | history
src/WOKTclLib/template.vc8 patch | blob | blame | history
src/WOKTclLib/template.vc8_64 patch | blob | blame | history
src/WOKTclLib/template.vc8x patch | blob | blame | history
src/WOKTclLib/template.vc8x_64 patch | blob | blame | history
src/WOKTclLib/template.vc9 patch | blob | blame | history
src/WOKTclLib/template.vc9_64 patch | blob | blame | history
src/WOKTclLib/template.vc9x patch | blob | blame | history
src/WOKTclLib/template.vc9x_64 patch | blob | blame | history

diff --git a/src/WOKTclLib/template.vc10 b/src/WOKTclLib/template.vc10
index 92f77dd93a5c7ec26bb93bc6348fcc0db5099d8c..2ab111213eafa58c1a8c860a13ba46d82da8b5af 100644 (file)
--- a/src/WOKTclLib/template.vc10
+++ b/src/WOKTclLib/template.vc10
@@ -53,7 +53,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -92,7 +92,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win32\vc10\objd\__TKNAM__/</AssemblerListingLocation>
diff --git a/src/WOKTclLib/template.vc10_64 b/src/WOKTclLib/template.vc10_64
index ea3b15c6da6234c2cb747649063ef7dec7e0475c..d04a1936964e685c8b0805ad7ee4c7a0fea4b1c2 100644 (file)
--- a/src/WOKTclLib/template.vc10_64
+++ b/src/WOKTclLib/template.vc10_64
@@ -53,7 +53,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES);_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -92,7 +92,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win64\vc10\objd\__TKNAM__/</AssemblerListingLocation>
diff --git a/src/WOKTclLib/template.vc10x b/src/WOKTclLib/template.vc10x
index 2c2977e0ce58f82fcbdf29efbcfaa6b15291c382..d2227a3b51de1d19bedcb9de7415f68fd46be23f 100644 (file)
--- a/src/WOKTclLib/template.vc10x
+++ b/src/WOKTclLib/template.vc10x
@@ -53,7 +53,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -91,7 +91,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win32\vc10\objd\__XQTNAM__/</AssemblerListingLocation>
diff --git a/src/WOKTclLib/template.vc10x_64 b/src/WOKTclLib/template.vc10x_64
index 0b1ad06c07b43c564e7fdaf1d418ff260d2f1847..62041d1bf300ead670c2f4cb47252199fc63d70b 100644 (file)
--- a/src/WOKTclLib/template.vc10x_64
+++ b/src/WOKTclLib/template.vc10x_64
@@ -53,7 +53,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES);_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -91,7 +91,7 @@
       <AdditionalOptions>/DWNT %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AssemblerListingLocation>.\..\..\..\win64\vc10\objd\__XQTNAM__/</AssemblerListingLocation>
diff --git a/src/WOKTclLib/template.vc8 b/src/WOKTclLib/template.vc8
index 1d2a59e1095aa6c365487f53b90cc8d2e8f8dbd8..ba133984041a30cfb498c21269b4c64e3327c26c 100755 (executable)
--- a/src/WOKTclLib/template.vc8
+++ b/src/WOKTclLib/template.vc8
@@ -47,7 +47,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -143,7 +143,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)"
                                ExceptionHandling="2"
                                RuntimeLibrary="3"
                                PrecompiledHeaderFile=".\..\..\..\win32\vc8\objd\__TKNAM__\__TKNAM__.pch"
diff --git a/src/WOKTclLib/template.vc8_64 b/src/WOKTclLib/template.vc8_64
index b96f6310e8707061ec6111f163081735250852ef..d9a3aa11e68709694e85dcafc36da41540426750 100755 (executable)
--- a/src/WOKTclLib/template.vc8_64
+++ b/src/WOKTclLib/template.vc8_64
@@ -47,7 +47,7 @@
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES);_OCC64"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -143,7 +143,7 @@
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64"
                                ExceptionHandling="2"
                                RuntimeLibrary="3"
                                PrecompiledHeaderFile=".\..\..\..\win64\vc8\objd\__TKNAM__\__TKNAM__.pch"
diff --git a/src/WOKTclLib/template.vc8x b/src/WOKTclLib/template.vc8x
index e95b0a0f40a78cd4c41e575809de8ef834513407..e2dc5bc6ae03698378e1a61b19deabf182bd9d1c 100755 (executable)
--- a/src/WOKTclLib/template.vc8x
+++ b/src/WOKTclLib/template.vc8x
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/DWNT"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;HAVE_TBB;"
+                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -140,7 +140,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;HAVE_TBB;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
diff --git a/src/WOKTclLib/template.vc8x_64 b/src/WOKTclLib/template.vc8x_64
index 7e3473f2a9502149db59776a4ac5e74eaad209bd..8276aa1c5d7f2260fb1ac225d679d0d87de555d3 100755 (executable)
--- a/src/WOKTclLib/template.vc8x_64
+++ b/src/WOKTclLib/template.vc8x_64
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -141,7 +141,7 @@
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
diff --git a/src/WOKTclLib/template.vc9 b/src/WOKTclLib/template.vc9
index b438e9ca2e19c33db42fba9208b4365eba8db89e..422eaab3ffbe15742938cff64b27845e76a89ac6 100755 (executable)
--- a/src/WOKTclLib/template.vc9
+++ b/src/WOKTclLib/template.vc9
@@ -48,7 +48,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -142,7 +142,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)"
                                ExceptionHandling="2"
                                RuntimeLibrary="3"
                                PrecompiledHeaderFile=".\..\..\..\win32\vc9\objd\__TKNAM__\__TKNAM__.pch"
diff --git a/src/WOKTclLib/template.vc9_64 b/src/WOKTclLib/template.vc9_64
index 32b0641a3a46e9f88d3cc48c462884f112496ee2..198e0f5db9910b9679fb987b4c6cae9208268af1 100755 (executable)
--- a/src/WOKTclLib/template.vc9_64
+++ b/src/WOKTclLib/template.vc9_64
@@ -48,7 +48,7 @@
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES);_OCC64"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -140,7 +140,7 @@
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64"
                                ExceptionHandling="2"
                                RuntimeLibrary="3"
                                PrecompiledHeaderFile=".\..\..\..\win64\vc9\objd\__TKNAM__\__TKNAM__.pch"
diff --git a/src/WOKTclLib/template.vc9x b/src/WOKTclLib/template.vc9x
index 2e7627b4f8e9d3059ee205c4e17c6025d8283851..a58143956786d96d4d7607119bfa23e3e2caee2d 100755 (executable)
--- a/src/WOKTclLib/template.vc9x
+++ b/src/WOKTclLib/template.vc9x
@@ -48,7 +48,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/DWNT"
                                Optimization="0"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="2"
diff --git a/src/WOKTclLib/template.vc9x_64 b/src/WOKTclLib/template.vc9x_64
index 2182894c9ea74ee959a2dd2fbb6559560793b858..102ffb38c00a07f0b0c247eb6bd533e3a8391505 100755 (executable)
--- a/src/WOKTclLib/template.vc9x_64
+++ b/src/WOKTclLib/template.vc9x_64
@@ -48,7 +48,7 @@
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -137,7 +137,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/favor:blend /DWNT"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
+                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES);_OCC64"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
OCCT WOK repository