]> 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: 856e48f)
Update templates for VC projects. Adding HAVE_TBB
authorinv <inv@opencascade.com>
Wed, 8 Sep 2010 07:15:23 +0000 (07:15 +0000)
committerinv <inv@opencascade.com>
Wed, 8 Sep 2010 07:15:23 +0000 (07:15 +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 6d7e4886f58abb50acb06683f09ce96329da98c5..92f77dd93a5c7ec26bb93bc6348fcc0db5099d8c 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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;%(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB;%(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 b2b1ad5db0cc20a0bb15dd8aa5520889c2825678..ea3b15c6da6234c2cb747649063ef7dec7e0475c 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;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_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;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_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 ce996054fe7811629b5f65a6739ad9160ca5e4f5..2c2977e0ce58f82fcbdf29efbcfaa6b15291c382 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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;%(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB;%(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 0ccdf4e6bda4a35d5719c8c5e8f1454f264a5973..0b1ad06c07b43c564e7fdaf1d418ff260d2f1847 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;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_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;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_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 efae0bea0bb661874228787093ee27601794934b..1d2a59e1095aa6c365487f53b90cc8d2e8f8dbd8 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"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -143,7 +143,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB"
                                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 7d9be59a7488cca74527afd426dad14e1a5a6332..b96f6310e8707061ec6111f163081735250852ef 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;_OCC64"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_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;_OCC64"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_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 8dd1c7f61e408b4387f5f70735155ef8a9a9d0a6..e95b0a0f40a78cd4c41e575809de8ef834513407 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;"
+                               PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;HAVE_TBB;"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -140,7 +140,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;HAVE_TBB;"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
diff --git a/src/WOKTclLib/template.vc8x_64 b/src/WOKTclLib/template.vc8x_64
index 9ddf049ec6b002dc9009c7c36b58ef3be6b14eb0..7e3473f2a9502149db59776a4ac5e74eaad209bd 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;_OCC64"
+                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;HAVE_TBB;_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;_OCC64"
+                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
diff --git a/src/WOKTclLib/template.vc9 b/src/WOKTclLib/template.vc9
index c9a4613fe1bac7f4a6cac81a75f618e663ffdb7f..b438e9ca2e19c33db42fba9208b4365eba8db89e 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"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -142,7 +142,7 @@
                                AdditionalOptions="/DWNT"
                                Optimization="0"
                                InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB"
                                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 b9e57b72d199856a298dc0524bb38679fa541f26..32b0641a3a46e9f88d3cc48c462884f112496ee2 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;_OCC64"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB;_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;_OCC64"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;HAVE_TBB;_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 cd24f3dfc7a61f12cf9bc037df4d3484baca9bf8..2e7627b4f8e9d3059ee205c4e17c6025d8283851 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"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;HAVE_TBB"
                                StringPooling="true"
                                ExceptionHandling="2"
                                RuntimeLibrary="2"
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/DWNT"
                                Optimization="0"
-                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB"
+                               PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;HAVE_TBB"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="2"
diff --git a/src/WOKTclLib/template.vc9x_64 b/src/WOKTclLib/template.vc9x_64
index 7a71b8194f65b06eaa00c166d9e3f1f72260d9ea..2182894c9ea74ee959a2dd2fbb6559560793b858 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;_OCC64"
+                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;HAVE_TBB;_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;_OCC64"
+                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;HAVE_TBB;_OCC64"
                                ExceptionHandling="2"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
OCCT WOK repository