0026787: Do not declare redundant macros WNT, LIN, WIN32, WIN64 within samples projec...
authorski <ski@opencascade.com>
Fri, 23 Oct 2015 13:12:34 +0000 (16:12 +0300)
committerbugmaster <bugmaster@opencascade.com>
Thu, 29 Oct 2015 08:03:26 +0000 (11:03 +0300)
Redundant macros were removed.

Defines _WIN32, __linux__ and LININTEL were removed from qt samples *.pro files

82 files changed:
samples/CSharp/OCCTProxy/OCCTProxy.vcproj
samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
samples/mfc/standard/01_Geometry/src/StdAfx.h
samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
samples/mfc/standard/02_Modeling/src/StdAfx.h
samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/src/StdAfx.h
samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/src/StdAfx.h
samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx
samples/mfc/standard/05_ImportExport/src/FSD_CArchive.hxx
samples/mfc/standard/05_ImportExport/src/FSD_CFile.hxx
samples/mfc/standard/05_ImportExport/src/StdAfx.h
samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/src/StdAfx.h
samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/src/StdAfx.h
samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
samples/mfc/standard/08_HLR/src/StdAfx.h
samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
samples/mfc/standard/09_Animation/src/StdAfx.h
samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp
samples/mfc/standard/10_Convert/src/WNT/StdAfx.h
samples/mfc/standard/Common/StdAfx.h
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
samples/qt/Common/src/CommonSample.h
samples/qt/Common/src/View.cxx
samples/qt/IESample/IESample.pro
samples/qt/Interface/src/IESample.h
samples/qt/Tutorial/Tutorial.pro

index 49075d5..f7ff0be 100644 (file)
@@ -47,7 +47,6 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
-                               PreprocessorDefinitions="WNT"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
-                               PreprocessorDefinitions="WNT"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
-                               PreprocessorDefinitions="WNT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
-                               PreprocessorDefinitions="WNT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
index 44cf28a..6ccb3ad 100644 (file)
@@ -83,7 +83,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
index e639973..9c11a90 100644 (file)
@@ -47,7 +47,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
-                               PreprocessorDefinitions="WNT;_DEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
-                               PreprocessorDefinitions="WNT;_DEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
-                               PreprocessorDefinitions="WNT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
-                               PreprocessorDefinitions="WNT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
index 893197e..48c3c48 100644 (file)
@@ -84,7 +84,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
index 185fefe..dff201b 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 21ce01d..e0bb4f8 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 57d22bb..996256a 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index bddf957..10d426b 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 360a0de..b09ea68 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index ae941c8..715a766 100755 (executable)
@@ -15,11 +15,7 @@ static char THIS_FILE[] = __FILE__;
 #endif
 #include "GeomSources.h"
 
-#ifdef WNT
- #define EOL "\r\n"
-#else
- #define EOL "\n"
-#endif
+#define EOL "\r\n"
 
 #define WAIT_A_LITTLE WaitForInput(500)
 
index 6cc9ea2..605e133 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index f9d198f..e102cdc 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 1979d06..7c6c81e 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 19a9ada..ca9816c 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 424e1ab..6feed04 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
index 91ad9d2..9bdf8fd 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
index f8b0a8f..38efb0f 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index 85321a5..0cd7041 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 7520e74..6848982 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 989b2bb..8dae73f 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index a73270a..e4b0706 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 44cafd2..0e44d76 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 65799e0..100ccc9 100755 (executable)
@@ -16,9 +16,6 @@
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index 921cf4a..924ff74 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 62c4b22..67ad3aa 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 014cc64..be79f86 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index f424f45..122042b 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 4022996..8fb95c6 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index b15dda5..2d55614 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index 24c1d4f..a04536a 100755 (executable)
@@ -34,11 +34,7 @@ const TexturesExt_Presentation::PSampleFuncType TexturesExt_Presentation::Sample
   &TexturesExt_Presentation::sampleKitchen
 };
 
-#ifdef WNT
- #define EOL "\r\n"
-#else
- #define EOL "\n"
-#endif
+#define EOL "\r\n"
 
 #define ZVIEW_SIZE 100
 
index 47a2203..e529692 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index d90bc55..8582ad4 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index bc1f7af..15d403e 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index b35e2c7..cb50ffd 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 5dfc6c2..c4226ca 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 16b919d..dbc328f 100755 (executable)
@@ -33,21 +33,14 @@ FSD_Archive::FSD_Archive(const FSD_CArchive& anArchive)
   myExternFlag = Standard_True;
   myCFile = NULL;
   myFormat = Standard_False;
-#ifdef WNT
   if (myStream->IsLoading()) SetOpenMode(Storage_VSRead);
   else SetOpenMode(Storage_VSWrite);
-#endif
 }
 
-Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString&
-#ifdef WNT
-                                          aName
-#endif
-                                         )
+Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString& aName)
 {
   FSD_Archive      f;
   Storage_Error s;
-#ifdef WNT
   s = f.Open(aName,Storage_VSRead);
 
   if (s == Storage_VSOk) {
@@ -62,23 +55,15 @@ Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString&
       s = Storage_VSFormatError;
     }
   }
-#else
-       s = Storage_VSFormatError;
-#endif
   return s;
 }
 
 Storage_Error FSD_Archive::Open(const TCollection_AsciiString& theName,
-                                const Storage_OpenMode
-#ifdef WNT
-                                aMode
-#endif
-                               )
+                                const Storage_OpenMode aMode)
 {
   Storage_Error result = Storage_VSOk;
   CString aName = theName.ToCString();
   SetName (theName);
-#ifdef WNT
   if (OpenMode() == Storage_VSNone) {
        if (aMode == Storage_VSRead) {
                if (!((FSD_CFile*)myCFile)->Open(aName, CFile::modeRead))
@@ -109,9 +94,6 @@ Storage_Error FSD_Archive::Open(const TCollection_AsciiString& theName,
   else {
          result = Storage_VSAlreadyOpen;
   }
-#else
-       result = Storage_VSOpenError;
-#endif
   return result;
 }
 
@@ -127,7 +109,6 @@ Storage_Error FSD_Archive::Close()
   myEof = Standard_False;
 
   if (OpenMode() != Storage_VSNone) {
-#ifdef WNT
       if (!myExternFlag) {
                (*myStream).Close();
                ((FSD_CFile*)myCFile)->Close();
@@ -136,7 +117,6 @@ Storage_Error FSD_Archive::Close()
       myExternFlag = Standard_False;
        myStream = NULL;
       SetOpenMode(Storage_VSNone);
-#endif
   }
   else {
     result = Storage_VSNotOpen;
@@ -153,13 +133,8 @@ const Standard_CString FSD_Archive::MagicNumber()
 }
 
 
-void FSD_Archive::ReadLine(TCollection_AsciiString& 
-#ifdef WNT
-                                                    buffer
-#endif
-                          )
+void FSD_Archive::ReadLine(TCollection_AsciiString& buffer)
 {
-#ifdef WNT
   TRY {
        char c;
        Standard_Boolean IsEnd = Standard_False;
@@ -182,31 +157,19 @@ void FSD_Archive::ReadLine(TCollection_AsciiString&
        if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True;
   }
   END_CATCH
-#endif
 }
 
-void FSD_Archive::WriteLine(const TCollection_AsciiString& 
-#ifdef WNT
-                                                    buffer
-#endif
-                          )
+void FSD_Archive::WriteLine(const TCollection_AsciiString& buffer)
 {
-#ifdef WNT
        Standard_Integer i;
   for (i = 1; i <= buffer.Length(); i++) {
          (*myStream) << buffer.Value(i);
        }
   (*myStream) << (Standard_Character)0;
-#endif
 }
 
-void FSD_Archive::WriteExtendedLine(const TCollection_ExtendedString&
-#ifdef WNT
-                                    buffer
-#endif
-                                   )
+void FSD_Archive::WriteExtendedLine(const TCollection_ExtendedString& buffer)
 {
-#ifdef WNT
   Standard_ExtString extBuffer;
   Standard_Integer   i;
 
@@ -217,16 +180,10 @@ void FSD_Archive::WriteExtendedLine(const TCollection_ExtendedString&
   }
 
   (*myStream) << (Standard_ExtCharacter)0;
-#endif
 }
 
-void FSD_Archive::ReadExtendedLine(TCollection_ExtendedString&
-#ifdef WNT
-                                   buffer
-#endif
-                                  )
+void FSD_Archive::ReadExtendedLine(TCollection_ExtendedString& buffer)
 {
-#ifdef WNT
   TRY {
        Standard_ExtCharacter i = 0;
        Standard_Boolean fin = Standard_False;
@@ -243,20 +200,10 @@ void FSD_Archive::ReadExtendedLine(TCollection_ExtendedString&
        if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True;
   }
   END_CATCH
-#endif
 }
 
-void FSD_Archive::ReadChar(TCollection_AsciiString&
-#ifdef WNT
-                           buffer
-#endif
-                           ,const Standard_Integer
-#ifdef WNT
-                           rsize
-#endif
-                          )
+void FSD_Archive::ReadChar(TCollection_AsciiString& buffer, const Standard_Integer rsize)
 {
-#ifdef WNT
   TRY {
        char             c;
        Standard_Integer ccount = 0;
@@ -273,17 +220,11 @@ void FSD_Archive::ReadChar(TCollection_AsciiString&
        if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True;
   }
   END_CATCH
-#endif
 }
 
 
-Storage_Error FSD_Archive::FindTag(const Standard_CString
-#ifdef WNT
-                                   aTag
-#endif
-                                  )
+Storage_Error FSD_Archive::FindTag(const Standard_CString aTag)
 {
-#ifdef WNT
   TCollection_AsciiString l;
   Standard_CString str;
 
@@ -307,14 +248,10 @@ Storage_Error FSD_Archive::FindTag(const Standard_CString
   else {
     return Storage_VSOk;
   }
-#else
-  return Storage_VSSectionNotFound;
-#endif
 }
 
 void FSD_Archive::SkipObject()
 {
-#ifdef WNT
        Standard_Boolean errorStatus = Standard_False;
        TRY {
                char c;
@@ -369,18 +306,12 @@ void FSD_Archive::SkipObject()
                else if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True;
        }
        END_CATCH
-#endif 
 }
 
 // ---------------------- PUBLIC : PUT
 
-Storage_BaseDriver& FSD_Archive::PutReference(const Standard_Integer
-#ifdef WNT
-                                              aValue
-#endif
-                                             )
+Storage_BaseDriver& FSD_Archive::PutReference(const Standard_Integer aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
 
   TRY {
@@ -392,17 +323,11 @@ Storage_BaseDriver& FSD_Archive::PutReference(const Standard_Integer
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::PutCharacter(const Standard_Character
-#ifdef WNT
-                                              aValue
-#endif
-                                             )
+Storage_BaseDriver& FSD_Archive::PutCharacter(const Standard_Character aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
 
   TRY {
@@ -416,17 +341,11 @@ Storage_BaseDriver& FSD_Archive::PutCharacter(const Standard_Character
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::PutExtCharacter(const Standard_ExtCharacter
-#ifdef WNT
-                                                 aValue
-#endif
-                                                )
+Storage_BaseDriver& FSD_Archive::PutExtCharacter(const Standard_ExtCharacter aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << FSD_EXT << aValue;
@@ -437,17 +356,11 @@ Storage_BaseDriver& FSD_Archive::PutExtCharacter(const Standard_ExtCharacter
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::PutInteger(const Standard_Integer
-#ifdef WNT
-                                            aValue
-#endif
-                                           )
+Storage_BaseDriver& FSD_Archive::PutInteger(const Standard_Integer aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << FSD_INT << aValue;
@@ -458,17 +371,11 @@ Storage_BaseDriver& FSD_Archive::PutInteger(const Standard_Integer
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::PutBoolean(const Standard_Boolean
-#ifdef WNT
-                                            aValue
-#endif
-                                           )
+Storage_BaseDriver& FSD_Archive::PutBoolean(const Standard_Boolean aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << FSD_BOO << ((Standard_Integer)aValue);
@@ -479,17 +386,11 @@ Storage_BaseDriver& FSD_Archive::PutBoolean(const Standard_Boolean
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::PutReal(const Standard_Real
-#ifdef WNT
-                                         aValue
-#endif
-                                        )
+Storage_BaseDriver& FSD_Archive::PutReal(const Standard_Real aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << FSD_REA << ((Standard_Real)aValue);
@@ -500,17 +401,11 @@ Storage_BaseDriver& FSD_Archive::PutReal(const Standard_Real
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::PutShortReal(const Standard_ShortReal
-#ifdef WNT
-                                              aValue
-#endif
-                                             )
+Storage_BaseDriver& FSD_Archive::PutShortReal(const Standard_ShortReal aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << FSD_SHO << aValue;
@@ -521,19 +416,13 @@ Storage_BaseDriver& FSD_Archive::PutShortReal(const Standard_ShortReal
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#endif
   return *this;
 }
 
 // ----------------- PUBLIC : GET
 
-Storage_BaseDriver& FSD_Archive::GetReference(Standard_Integer&
-#ifdef WNT
-                                              aValue
-#endif
-                                             )
+Storage_BaseDriver& FSD_Archive::GetReference(Standard_Integer& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        char ptype;
@@ -549,17 +438,11 @@ Storage_BaseDriver& FSD_Archive::GetReference(Standard_Integer&
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::GetCharacter(Standard_Character&
-#ifdef WNT
-                                              aValue
-#endif
-                                             )
+Storage_BaseDriver& FSD_Archive::GetCharacter(Standard_Character& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //unsigned short i;
@@ -579,17 +462,11 @@ Storage_BaseDriver& FSD_Archive::GetCharacter(Standard_Character&
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::GetExtCharacter(Standard_ExtCharacter&
-#ifdef WNT
-                                                 aValue
-#endif
-                                                )
+Storage_BaseDriver& FSD_Archive::GetExtCharacter(Standard_ExtCharacter& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        char ptype;
@@ -605,17 +482,11 @@ Storage_BaseDriver& FSD_Archive::GetExtCharacter(Standard_ExtCharacter&
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::GetInteger(Standard_Integer&
-#ifdef WNT
-                                            aValue
-#endif
-                                           )
+Storage_BaseDriver& FSD_Archive::GetInteger(Standard_Integer& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        char ptype;
@@ -631,17 +502,11 @@ Storage_BaseDriver& FSD_Archive::GetInteger(Standard_Integer&
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::GetBoolean(Standard_Boolean&
-#ifdef WNT
-                                            aValue
-#endif
-                                           )
+Storage_BaseDriver& FSD_Archive::GetBoolean(Standard_Boolean& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        char ptype;
@@ -657,17 +522,11 @@ Storage_BaseDriver& FSD_Archive::GetBoolean(Standard_Boolean&
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::GetReal(Standard_Real&
-#ifdef WNT
-                                         aValue
-#endif
-                                        )
+Storage_BaseDriver& FSD_Archive::GetReal(Standard_Real& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        char ptype;
@@ -683,17 +542,11 @@ Storage_BaseDriver& FSD_Archive::GetReal(Standard_Real&
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
-Storage_BaseDriver& FSD_Archive::GetShortReal(Standard_ShortReal&
-#ifdef WNT
-                                              aValue
-#endif
-                                             )
+Storage_BaseDriver& FSD_Archive::GetShortReal(Standard_ShortReal& aValue)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
 char ptype;
@@ -709,7 +562,6 @@ char ptype;
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#endif
   return *this;
 }
 
@@ -731,7 +583,6 @@ void FSD_Archive::Destroy()
 
 Storage_Error FSD_Archive::BeginWriteInfoSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
          //(*myStream) << FSD_Archive::MagicNumber();
@@ -745,51 +596,19 @@ Storage_Error FSD_Archive::BeginWriteInfoSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else 
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
-void FSD_Archive::WriteInfo(const Standard_Integer
-#ifdef WNT
-                            nbObj
-#endif
-                           ,const TCollection_AsciiString&
-#ifdef WNT
-                            dbVersion
-#endif
-                           ,const TCollection_AsciiString&
-#ifdef WNT
-                            date
-#endif
-                           ,const TCollection_AsciiString&
-#ifdef WNT
-                            schemaName
-#endif
-                           ,const TCollection_AsciiString&
-#ifdef WNT
-                            schemaVersion
-#endif
-                           ,const TCollection_ExtendedString&
-#ifdef WNT
-                            appName
-#endif
-                           ,const TCollection_AsciiString&
-#ifdef WNT
-                            appVersion
-#endif
-                           ,const TCollection_ExtendedString&
-#ifdef WNT
-                            dataType
-#endif
-                           ,const TColStd_SequenceOfAsciiString&
-#ifdef WNT
-                            userInfo
-#endif
-                           ) 
-{
-#ifdef WNT
+void FSD_Archive::WriteInfo(const Standard_Integer nbObj,
+                            const TCollection_AsciiString& dbVersion,
+                            const TCollection_AsciiString& date,
+                            const TCollection_AsciiString& schemaName,
+                            const TCollection_AsciiString& schemaVersion,
+                            const TCollection_ExtendedString& appName,
+                            const TCollection_AsciiString& appVersion,
+                            const TCollection_ExtendedString& dataType,
+                            const TColStd_SequenceOfAsciiString& userInfo)
+{
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        Standard_Integer i;
@@ -820,15 +639,12 @@ void FSD_Archive::WriteInfo(const Standard_Integer
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-         Storage_StreamWriteError::Raise();
-#endif
 }
 
 
 Storage_Error FSD_Archive::EndWriteInfoSection() 
 {
-#ifdef WNT
+
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "END_INFO_SECTION" << '\0';
@@ -840,16 +656,13 @@ Storage_Error FSD_Archive::EndWriteInfoSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-         Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
 Storage_Error FSD_Archive::BeginReadInfoSection() 
 {
   Storage_Error s;
-#ifdef WNT
+
   TCollection_AsciiString l;
   Standard_Integer len = (int)strlen(FSD_Archive::MagicNumber());
 
@@ -872,53 +685,21 @@ Storage_Error FSD_Archive::BeginReadInfoSection()
   else {
     s = FindTag("BEGIN_INFO_SECTION");
   }
-#else 
-       s = Storage_VSFormatError;
-#endif
   return s;
 }
 
 // ------------------- INFO : READ
 
-void FSD_Archive::ReadInfo(Standard_Integer&
-#ifdef WNT
-                           nbObj
-#endif
-                          ,TCollection_AsciiString&
-#ifdef WNT
-                           dbVersion
-#endif
-                          ,TCollection_AsciiString&
-#ifdef WNT
-                           date
-#endif
-                          ,TCollection_AsciiString&
-#ifdef WNT
-                           schemaName
-#endif
-                          ,TCollection_AsciiString&
-#ifdef WNT
-                           schemaVersion
-#endif
-                          ,TCollection_ExtendedString&
-#ifdef WNT
-                           appName
-#endif
-                          ,TCollection_AsciiString&
-#ifdef WNT
-                           appVersion
-#endif
-                          ,TCollection_ExtendedString&
-#ifdef WNT
-                           dataType
-#endif
-                          ,TColStd_SequenceOfAsciiString&
-#ifdef WNT
-                           userInfo
-#endif
-                          ) 
-{
-#ifdef WNT
+void FSD_Archive::ReadInfo(Standard_Integer& nbObj,
+                           TCollection_AsciiString& dbVersion,
+                           TCollection_AsciiString& date,
+                           TCollection_AsciiString& schemaName,
+                           TCollection_AsciiString& schemaVersion,
+                           TCollection_ExtendedString& appName,
+                           TCollection_AsciiString& appVersion,
+                           TCollection_ExtendedString& dataType,
+                           TColStd_SequenceOfAsciiString& userInfo) 
+{
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> nbObj;
@@ -950,7 +731,6 @@ void FSD_Archive::ReadInfo(Standard_Integer&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamTypeMismatchError::Raise();     
 }
 
@@ -963,7 +743,6 @@ Storage_Error FSD_Archive::EndReadInfoSection()
 
 Storage_Error FSD_Archive::BeginWriteCommentSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "BEGIN_COMMENT_SECTION" << '\0';
@@ -975,19 +754,11 @@ Storage_Error FSD_Archive::BeginWriteCommentSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();  
-#else
-       Storage_StreamWriteError::Raise();  
-#endif
   return Storage_VSOk;
 }
 
-void FSD_Archive::WriteComment(const TColStd_SequenceOfExtendedString&
-#ifdef WNT
-                                                                       aCom
-#endif
-                              )
+void FSD_Archive::WriteComment(const TColStd_SequenceOfExtendedString& aCom)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        Standard_Integer i,aSize;
@@ -1004,13 +775,11 @@ void FSD_Archive::WriteComment(const TColStd_SequenceOfExtendedString&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
 Storage_Error FSD_Archive::EndWriteCommentSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "END_COMMENT_SECTION" << '\0';
@@ -1022,9 +791,6 @@ Storage_Error FSD_Archive::EndWriteCommentSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
@@ -1035,13 +801,8 @@ Storage_Error FSD_Archive::BeginReadCommentSection()
   return FindTag("BEGIN_COMMENT_SECTION");
 }
 
-void FSD_Archive::ReadComment(TColStd_SequenceOfExtendedString&
-#ifdef WNT
-                                                                aCom
-#endif
-                             )
+void FSD_Archive::ReadComment(TColStd_SequenceOfExtendedString& aCom)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        TCollection_ExtendedString line;
@@ -1062,7 +823,6 @@ void FSD_Archive::ReadComment(TColStd_SequenceOfExtendedString&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamTypeMismatchError::Raise();
 }
 
@@ -1075,7 +835,6 @@ Storage_Error FSD_Archive::EndReadCommentSection()
 
 Storage_Error FSD_Archive::BeginWriteTypeSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "BEGIN_TYPE_SECTION" << '\0';
@@ -1087,19 +846,11 @@ Storage_Error FSD_Archive::BeginWriteTypeSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
-void FSD_Archive::SetTypeSectionSize(const Standard_Integer
-#ifdef WNT
-                                     aSize
-#endif
-                                    ) 
+void FSD_Archive::SetTypeSectionSize(const Standard_Integer aSize)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << aSize;
@@ -1110,21 +861,12 @@ void FSD_Archive::SetTypeSectionSize(const Standard_Integer
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
-void FSD_Archive::WriteTypeInformations(const Standard_Integer
-#ifdef WNT
-                                        typeNum
-#endif
-                                       ,const TCollection_AsciiString&
-#ifdef WNT
-                                        typeName
-#endif
-                                       ) 
+void FSD_Archive::WriteTypeInformations (const Standard_Integer typeNum,
+                                         const TCollection_AsciiString& typeName)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << typeNum << typeName.ToCString() << '\0';
@@ -1137,13 +879,11 @@ void FSD_Archive::WriteTypeInformations(const Standard_Integer
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
 Storage_Error FSD_Archive::EndWriteTypeSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "END_TYPE_SECTION" << '\0';
@@ -1155,9 +895,6 @@ Storage_Error FSD_Archive::EndWriteTypeSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
@@ -1171,7 +908,6 @@ Storage_Error FSD_Archive::BeginReadTypeSection()
 Standard_Integer FSD_Archive::TypeSectionSize() 
 {
   Standard_Integer i = 0;
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> i;
@@ -1183,23 +919,11 @@ Standard_Integer FSD_Archive::TypeSectionSize()
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#else
-       Storage_StreamTypeMismatchError::Raise();
-#endif
   return i;
 }
 
-void FSD_Archive::ReadTypeInformations(Standard_Integer&
-#ifdef WNT
-                                       typeNum
-#endif
-                                      ,TCollection_AsciiString&
-#ifdef WNT
-                                       typeName
-#endif
-                                      ) 
+void FSD_Archive::ReadTypeInformations(Standard_Integer& typeNum, TCollection_AsciiString& typeName)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        unsigned char c;
@@ -1221,7 +945,6 @@ void FSD_Archive::ReadTypeInformations(Standard_Integer&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamTypeMismatchError::Raise();
 }
 
@@ -1234,7 +957,6 @@ Storage_Error FSD_Archive::EndReadTypeSection()
 
 Storage_Error FSD_Archive::BeginWriteRootSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "BEGIN_ROOT_SECTION" << '\0';
@@ -1246,19 +968,11 @@ Storage_Error FSD_Archive::BeginWriteRootSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
-void FSD_Archive::SetRootSectionSize(const Standard_Integer
-#ifdef WNT
-                                     aSize
-#endif
-                                    ) 
+void FSD_Archive::SetRootSectionSize(const Standard_Integer aSize)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << aSize;
@@ -1269,25 +983,13 @@ void FSD_Archive::SetRootSectionSize(const Standard_Integer
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
-void FSD_Archive::WriteRoot(const TCollection_AsciiString&
-#ifdef WNT
-                                                           rootName
-#endif
-                            ,const Standard_Integer
-#ifdef WNT
-                                                   aRef
-#endif
-                            ,const TCollection_AsciiString&
-#ifdef WNT
-                                                           rootType
-#endif
-                           ) 
-{
-#ifdef WNT
+void FSD_Archive::WriteRoot (const TCollection_AsciiString& rootName,
+                             const Standard_Integer aRef,
+                             const TCollection_AsciiString& rootType)
+{
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << aRef << rootName.ToCString() << '\0' << rootType.ToCString() << '\0';
@@ -1302,13 +1004,11 @@ void FSD_Archive::WriteRoot(const TCollection_AsciiString&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
 Storage_Error FSD_Archive::EndWriteRootSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "END_ROOT_SECTION" << '\0';
@@ -1320,9 +1020,6 @@ Storage_Error FSD_Archive::EndWriteRootSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
@@ -1336,7 +1033,6 @@ Storage_Error FSD_Archive::BeginReadRootSection()
 Standard_Integer FSD_Archive::RootSectionSize() 
 {
   Standard_Integer i = 0;
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> i;
@@ -1348,27 +1044,13 @@ Standard_Integer FSD_Archive::RootSectionSize()
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#else
-       Storage_StreamTypeMismatchError::Raise();
-#endif
   return i;
 }
 
-void FSD_Archive::ReadRoot(TCollection_AsciiString&
-#ifdef WNT
-                           rootName
-#endif
-                           ,Standard_Integer&
-#ifdef WNT
-                           aRef
-#endif
-                           ,TCollection_AsciiString&
-#ifdef WNT
-                           rootType
-#endif
-                          ) 
-{
-#ifdef WNT
+void FSD_Archive::ReadRoot(TCollection_AsciiString& rootName,
+                           Standard_Integer& aRef,
+                           TCollection_AsciiString& rootType)
+{
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> aRef;
@@ -1382,7 +1064,6 @@ void FSD_Archive::ReadRoot(TCollection_AsciiString&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamTypeMismatchError::Raise();
 }
 
@@ -1395,7 +1076,6 @@ Storage_Error FSD_Archive::EndReadRootSection()
 
 Storage_Error FSD_Archive::BeginWriteRefSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "BEGIN_REF_SECTION" << '\0';
@@ -1407,19 +1087,11 @@ Storage_Error FSD_Archive::BeginWriteRefSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
-void FSD_Archive::SetRefSectionSize(const Standard_Integer
-#ifdef WNT
-                                    aSize
-#endif
-                                   ) 
+void FSD_Archive::SetRefSectionSize(const Standard_Integer aSize)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << aSize; 
@@ -1430,21 +1102,12 @@ void FSD_Archive::SetRefSectionSize(const Standard_Integer
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
-void FSD_Archive::WriteReferenceType(const Standard_Integer
-#ifdef WNT
-                                     reference
-#endif
-                                    ,const Standard_Integer
-#ifdef WNT
-                                     typeNum
-#endif
-                                    ) 
+void FSD_Archive::WriteReferenceType(const Standard_Integer reference,
+                                     const Standard_Integer typeNum)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << reference << typeNum;
@@ -1455,13 +1118,11 @@ void FSD_Archive::WriteReferenceType(const Standard_Integer
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
 Storage_Error FSD_Archive::EndWriteRefSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "END_REF_SECTION" << '\0';
@@ -1473,9 +1134,6 @@ Storage_Error FSD_Archive::EndWriteRefSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
@@ -1489,7 +1147,6 @@ Storage_Error FSD_Archive::BeginReadRefSection()
 Standard_Integer FSD_Archive::RefSectionSize() 
 {
   Standard_Integer i = 0;
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> i;
@@ -1501,23 +1158,12 @@ Standard_Integer FSD_Archive::RefSectionSize()
   END_CATCH
 
   if (errorStatus) Storage_StreamTypeMismatchError::Raise();
-#else
-       Storage_StreamTypeMismatchError::Raise();
-#endif
   return i;
 }
 
-void FSD_Archive::ReadReferenceType(Standard_Integer&
-#ifdef WNT
-                                    reference
-#endif
-                                   ,Standard_Integer&
-#ifdef WNT
-                                    typeNum
-#endif
-                                  ) 
+void FSD_Archive::ReadReferenceType(Standard_Integer& reference,
+                                    Standard_Integer& typeNum)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> reference;
@@ -1530,7 +1176,6 @@ void FSD_Archive::ReadReferenceType(Standard_Integer&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamTypeMismatchError::Raise();
 }
 
@@ -1543,7 +1188,6 @@ Storage_Error FSD_Archive::EndReadRefSection()
 
 Storage_Error FSD_Archive::BeginWriteDataSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "BEGIN_DATA_SECTION" << '\0';
@@ -1555,23 +1199,12 @@ Storage_Error FSD_Archive::BeginWriteDataSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
-void FSD_Archive::WritePersistentObjectHeader(const Standard_Integer
-#ifdef WNT
-                                              aRef
-#endif
-                                             ,const Standard_Integer
-#ifdef WNT
-                                             aType
-#endif
-                                            ) 
+void FSD_Archive::WritePersistentObjectHeader(const Standard_Integer aRef,
+                                              const Standard_Integer aType)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) << aRef << aType;
@@ -1582,7 +1215,6 @@ void FSD_Archive::WritePersistentObjectHeader(const Standard_Integer
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamWriteError::Raise();
 }
 
@@ -1600,14 +1232,11 @@ void FSD_Archive::EndWriteObjectData()
 
 void FSD_Archive::EndWritePersistentObjectData() 
 {      
-#ifdef WNT
        (*myStream) << 'E';
-#endif
 }
 
 Storage_Error FSD_Archive::EndWriteDataSection() 
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        //(*myStream) << "END_DATA_SECTION" << '\0';
@@ -1619,9 +1248,6 @@ Storage_Error FSD_Archive::EndWriteDataSection()
   END_CATCH
 
   if (errorStatus) Storage_StreamWriteError::Raise();
-#else
-       Storage_StreamWriteError::Raise();
-#endif
   return Storage_VSOk;
 }
 
@@ -1632,17 +1258,8 @@ Storage_Error FSD_Archive::BeginReadDataSection()
   return FindTag("BEGIN_DATA_SECTION");
 }
 
-void FSD_Archive::ReadPersistentObjectHeader(Standard_Integer&
-#ifdef WNT
-                                             aRef
-#endif
-                                             ,Standard_Integer&
-#ifdef WNT
-                                             aType
-#endif
-                                            ) 
+void FSD_Archive::ReadPersistentObjectHeader(Standard_Integer& aRef, Standard_Integer& aType)
 {
-#ifdef WNT
   Standard_Boolean errorStatus = Standard_False;
   TRY {
        (*myStream) >> aRef;
@@ -1655,7 +1272,6 @@ void FSD_Archive::ReadPersistentObjectHeader(Standard_Integer&
   END_CATCH
 
   if (errorStatus) 
-#endif
          Storage_StreamTypeMismatchError::Raise();
 }
 
@@ -1673,7 +1289,6 @@ void FSD_Archive::EndReadObjectData()
 
 void FSD_Archive::EndReadPersistentObjectData() 
 {
-#ifdef WNT
        char theEnd;
 
        (*myStream) >> theEnd;
@@ -1681,7 +1296,6 @@ void FSD_Archive::EndReadPersistentObjectData()
        if (theEnd != 'E') {
                Storage_StreamFormatError::Raise();
        }
-#endif
 }
 
 Storage_Error FSD_Archive::EndReadDataSection() 
index 5650a54..e580326 100755 (executable)
@@ -1,15 +1,9 @@
 #ifndef _FSD_CArchive_HeaderFile
 #define _FSD_CArchive_HeaderFile
 
-#ifdef WNT
-
 //#define _MBCS
-
 #include <afx.h>
 
 typedef CArchive* FSD_CArchive;
-#else
-typedef void* FSD_CArchive;
-#endif
 
 #endif
index 06e7941..64d9c75 100755 (executable)
@@ -1,15 +1,9 @@
 #ifndef _FSD_CFile_HeaderFile
 #define _FSD_CFile_HeaderFile
 
-#ifdef WNT
-
 //#define _MBCS
-
 #include <afx.h>
 
 typedef CFile FSD_CFile;
-#else
-typedef void* FSD_CFile;
-#endif
 
 #endif
index f4643a6..c9db7cc 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #define DEFAULT_DEVIATIONCOEFFICIENT 0.001
 #define DEFAULT_DCBIG 0.005
 #define DEFAULT_DCVBIG 0.01
index 951a35b..ed467b5 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 595aa2f..d590d83 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index b9c5a8a..78b8895 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 61becb6..b89eda0 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index e3f776f..6bfa341 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 011efaf..15d3604 100755 (executable)
 
 // CasCade :
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #ifdef MAINWIN
 # define false FALSE
 # define true TRUE
index e51c832..4474bd7 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 4919fc9..573065f 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 8979dd2..358260e 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 5cf258c..bc0ab91 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index fa7a4ce..8f6b485 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 2386e70..a6a14f5 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index dce1453..0e5b8f6 100755 (executable)
 
 #include <gp_Pnt.hxx>
 
-
-#ifdef WNT
- #define EOL "\r\n"
-#else
- #define EOL "\n"
-#endif
+#define EOL "\r\n"
 
 // Initialization of global variable with an instance of this class
 OCCDemo_Presentation* OCCDemo_Presentation::Current = new Tesselate_Presentation;
index 0780b39..8699aff 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 52fcda4..240b7d4 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index a8b7405..71347b3 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
index 493184e..b23cc58 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 16ea6aa..611e92d 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
index 998f02d..d9704f5 100755 (executable)
 
 // CasCade :
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #define DEFAULT_DEVIATIONCOEFFICIENT 0.001
 #define DEFAULT_DCBIG 0.005
 #define DEFAULT_DCVBIG 0.01
index 4d65db8..ed0e7b1 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 894b03e..ff89f79 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 8f8c417..997842e 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 3076a21..e82f0ef 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
index 1a4f05f..c0c7ac6 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
index 4a45eea..762f520 100755 (executable)
 
 // CasCade :
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 enum CurrentAction3d { 
   CurAction3d_Nothing,
   CurAction3d_DynamicZooming,
index 0c594cd..ba1a946 100644 (file)
@@ -93,7 +93,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
index 2f4bde2..201a8a8 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
index b9f5f50..54760da 100644 (file)
@@ -97,7 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
index 8f2cfcc..c528f3a 100644 (file)
@@ -54,7 +54,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
index 8d7411c..74455c5 100644 (file)
@@ -55,7 +55,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
index b893ec3..e91b206 100755 (executable)
@@ -54,11 +54,7 @@ static const Quantity_Color SurfaceColor     (1,1,0, Quantity_TOC_RGB);      //
 static const Quantity_Color BSplineColor     (1,0.647,0, Quantity_TOC_RGB);  // orange
 static const Quantity_Color BSplineSurfaceColor (0,0,1, Quantity_TOC_RGB);   // blue
 
-#ifdef WNT
- #define EOL "\r\n"
-#else
- #define EOL "\n"
-#endif
+#define EOL "\r\n"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
index 07ccc18..43eaa40 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index 0f0303b..41f1186 100755 (executable)
 #include <afxcmn.h>                    // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#if !defined(WNT)
-   #error WNT precompiler directive is mandatory for CasCade 
-#endif
-
 #pragma warning(  disable : 4244 )        // Issue warning 4244
 #include "Standard_ShortReal.hxx"
 #pragma warning(  default : 4244 )        // Issue warning 4244
index 9613da3..91c9e07 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 0eb3c5c..612269f 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 2c6e02c..bb56cb1 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>$(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 9bff5fa..38d91c4 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
index d195df8..f56fb5c 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500"
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500"
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
index 4900d13..4806bf2 100755 (executable)
@@ -3,13 +3,13 @@
 
 #ifndef NO_COMMONSAMPLE_EXPORTS
 #ifdef COMMONSAMPLE_EXPORTS
-#ifdef WIN32
+#ifdef _WIN32
 #define COMMONSAMPLE_EXPORT __declspec( dllexport )
 #else
 #define COMMONSAMPLE_EXPORT
 #endif
 #else
-#ifdef WIN32
+#ifdef _WIN32
 #define COMMONSAMPLE_EXPORT __declspec( dllimport )
 #else
 #define COMMONSAMPLE_EXPORT
index 4eca697..7014ad8 100755 (executable)
@@ -1,4 +1,4 @@
-#if !defined WNT
+#if !defined _WIN32
 #define QT_CLEAN_NAMESPACE         /* avoid definition of INT32 and INT8 */
 #endif
 
@@ -187,7 +187,7 @@ void View::init()
   Window aWindowHandle = (Window )winId();
   Handle(Aspect_DisplayConnection) aDispConnection = myContext->CurrentViewer()->Driver()->GetDisplayConnection();
   Handle(Xw_Window) hWnd = new Xw_Window (aDispConnection, aWindowHandle);
-#endif // WNT
+#endif // _WIN32
 
   myView->SetWindow (hWnd);
   if ( !hWnd->IsMapped() )
index 433524f..3bd3a3e 100755 (executable)
@@ -47,7 +47,6 @@ unix {
     MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
 
     !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
-    !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
     equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
     DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
     !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
@@ -70,7 +69,7 @@ win32 {
         MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
         LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
     }
-    DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
+    DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
 LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
index d7b2062..6eb8465 100755 (executable)
@@ -3,13 +3,13 @@
 
 #ifndef NO_IESAMPLE_EXPORTS
 #ifdef IESAMPLE_EXPORTS
-#ifdef WIN32
+#ifdef _WIN32
 #define IESAMPLE_EXPORT __declspec( dllexport )
 #else
 #define IESAMPLE_EXPORT
 #endif
 #else
-#ifdef WIN32
+#ifdef _WIN32
 #define IESAMPLE_EXPORT __declspec( dllimport )
 #else
 #define IESAMPLE_EXPORT
index dd66bb4..f07d77e 100755 (executable)
@@ -50,7 +50,6 @@ unix {
     MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
 
     !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
-    !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
     equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
     DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
     !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
@@ -73,7 +72,7 @@ win32 {
         MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
         LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
     }
-    DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
+    DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
 LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \