0023095: Porting demo and samples on OCCT 6.5.3
authordbv <dbv@opencascade.com>
Sat, 21 Apr 2012 09:47:03 +0000 (13:47 +0400)
committerdbv <dbv@opencascade.com>
Sat, 21 Apr 2012 09:47:03 +0000 (13:47 +0400)
76 files changed:
samples/CSharp/IE/IE.csproj
samples/CSharp/IE/IE.sln
samples/CSharp/OCC/OCC.vcproj
samples/CSharp/Run_MSVC.bat [deleted file]
samples/CSharp/env.bat [deleted file]
samples/CSharp/msvc.bat [new file with mode: 0644]
samples/CSharp/run.bat [new file with mode: 0644]
samples/CSharp/shell/shell.vcproj
samples/mfc/standard/01_Geometry/adm/win/vc10/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/02_Modeling/adm/win/vc10/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/03_Viewer2d/adm/win/vc10/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/04_Viewer3d/adm/win/vc10/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/TexturesExt_Presentation.cpp
samples/mfc/standard/05_ImportExport/adm/win/vc10/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/06_Ocaf/adm/win/vc10/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/07_Triangulation/adm/win/vc10/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/08_HLR/adm/win/vc10/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/09_Animation/adm/win/vc10/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/10_Convert/adm/win/vc10/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/Run.bat [deleted file]
samples/mfc/standard/Run_MSVC.bat [deleted file]
samples/mfc/standard/env.bat [changed mode: 0755->0644]
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
samples/mfc/standard/msvc.bat [new file with mode: 0644]
samples/mfc/standard/readme.txt
samples/mfc/standard/run.bat [new file with mode: 0644]
samples/qt/IESample/IESample-vc10.sln
samples/qt/IESample/IESample-vc8.sln
samples/qt/IESample/IESample.pro
samples/qt/IESample/Run_MSVC.bat [deleted file]
samples/qt/IESample/env.bat
samples/qt/IESample/generation-vc-projects.bat
samples/qt/IESample/msvc.bat [new file with mode: 0644]
samples/qt/IESample/run.bat [moved from samples/qt/IESample/Run.bat with 56% similarity, mode: 0644]
samples/qt/Tutorial/Run.bat [deleted file]
samples/qt/Tutorial/Run_MSVC.bat [deleted file]
samples/qt/Tutorial/Tutorial-vc10.sln
samples/qt/Tutorial/Tutorial-vc8.sln
samples/qt/Tutorial/Tutorial-vc9.sln
samples/qt/Tutorial/Tutorial.pro
samples/qt/Tutorial/env.bat
samples/qt/Tutorial/generation-vc-projects.bat
samples/qt/Tutorial/msvc.bat [new file with mode: 0644]
samples/qt/Tutorial/run.bat [new file with mode: 0644]
samples/qt/Tutorial/src/MakeBottle.cxx
samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
samples/qt/voxeldemo/Run.bat [deleted file]
samples/qt/voxeldemo/Run_MSVC.bat [deleted file]
samples/qt/voxeldemo/VoxelDemo-vc9.sln [new file with mode: 0644]
samples/qt/voxeldemo/VoxelDemo.vcproj
samples/qt/voxeldemo/env.bat
samples/qt/voxeldemo/msvc.bat [new file with mode: 0644]
samples/qt/voxeldemo/run.bat [new file with mode: 0644]
samples/qt/voxeldemo/src/Application.cpp

index fbf7b80..160a479 100755 (executable)
@@ -1,4 +1,4 @@
-\feff<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+\feff<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -25,6 +25,8 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <ApplicationRevision>0</ApplicationRevision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
index 577dd7e..120ac23 100755 (executable)
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE", "IE.csproj", "{B9914BB3-B886-4B41-B48D-350EBEBEFD1F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OCC", "..\OCC\OCC.vcproj", "{DCB139CF-2190-412E-B72F-8B080CC01422}"
index 0a778dc..ad731fd 100755 (executable)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="9,00"
        Name="OCC"
        ProjectGUID="{DCB139CF-2190-412E-B72F-8B080CC01422}"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
        >
        <Platforms>
                <Platform
@@ -41,7 +42,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="$(CSF_OPT_INC)"
                                PreprocessorDefinitions="WNT"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                AdditionalDependencies="TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib TKBool.lib TKPShape.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKG2d.lib TKG3d.lib PTKernel.lib TKShapeSchema.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
                                OutputFile="$(OutDir)/OCC.dll"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
+                               AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                ProgramDatabaseFile="$(OutDir)/OCC.pdb"
                                SubSystem="2"
                                ResourceOnlyDLL="false"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                ImportLibrary="$(OutDir)/OCC.lib"
                                TargetMachine="1"
                        />
@@ -93,9 +96,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="$(CSF_OPT_INC)"
                                PreprocessorDefinitions="WNT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="2"
                                AdditionalDependencies="TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib TKBool.lib TKPShape.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKG2d.lib TKG3d.lib PTKernel.lib TKShapeSchema.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
                                OutputFile="$(OutDir)/OCC.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
+                               AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                ImportLibrary="$(OutDir)/OCC.lib"
                                TargetMachine="1"
                        />
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
diff --git a/samples/CSharp/Run_MSVC.bat b/samples/CSharp/Run_MSVC.bat
deleted file mode 100755 (executable)
index 362c111..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-rem Launch MS VC with environment prepared for building OCCT C# sample
-
-rem Set build environment 
-call %~dp0..\..\ros\env_build.bat vc8 win32
-
-rem Define path to project file
-set PRJFILE=%~dp0IE\IE.sln
-
-rem Launch Visual Studio - either professional (devenv) or Express, as available
-if exist %DevEnvDir%\devenv.exe (
-    start %DevEnvDir%\devenv.exe %PRJFILE% /useenv
-) else if exist %DevEnvDir%\VCExpress.exe (
-    start %DevEnvDir%\VCExpress.exe %PRJFILE% /useenv
-) else (
-    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
-)
-
diff --git a/samples/CSharp/env.bat b/samples/CSharp/env.bat
deleted file mode 100644 (file)
index 94db5b7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-@ECHO OFF
-
-call "%~dp0..\..\ros\env.bat"
\ No newline at end of file
diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat
new file mode 100644 (file)
index 0000000..6a8707d
--- /dev/null
@@ -0,0 +1,3 @@
+call ../../env.bat %1 %2 %3
+if not ["%CASDEB%"] == [""] call ../../msvc.bat %VCVER% win%ARCH% %CASDEB% %~dp0IE\IE.sln
+if ["%CASDEB%"] == [""] call ../../msvc.bat %VCVER% win%ARCH% "" %~dp0IE\IE.sln
\ No newline at end of file
diff --git a/samples/CSharp/run.bat b/samples/CSharp/run.bat
new file mode 100644 (file)
index 0000000..104ecef
--- /dev/null
@@ -0,0 +1,4 @@
+call ../../env.bat %1 %2 %3
+if not ["%CASDEB%"] == [""] set "BinDir=Debug"
+if ["%CASDEB%"] == [""] set "BinDir=Release"
+%~dp0IE\bin\%BinDir%\IE.exe
\ No newline at end of file
index 72bf9d6..5df333a 100755 (executable)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="9,00"
        Name="shell"
        ProjectGUID="{969912D9-78E7-4AB8-B4FF-6B52B4F03991}"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
        >
        <Platforms>
                <Platform
@@ -41,7 +42,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
                                PreprocessorDefinitions="WNT"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                AdditionalDependencies="OCC.lib TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib PTKernel.lib TKShapeSchema.lib TKBool.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKPShape.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
                                OutputFile="$(OutDir)/shell.dll"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CASROOT)\win32\lib"
+                               AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                ProgramDatabaseFile="$(OutDir)/shell.pdb"
                                SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                ImportLibrary="$(OutDir)/shell.lib"
                                TargetMachine="1"
                        />
@@ -92,9 +95,6 @@
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
                                PreprocessorDefinitions="WNT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                AdditionalDependencies="OCC.lib TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib PTKernel.lib TKShapeSchema.lib TKBool.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKPShape.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
                                OutputFile="$(OutDir)/shell.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CASROOT)\win32\vc8\lib"
+                               AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CSF_OPT_LIB32)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                ImportLibrary="$(OutDir)/shell.lib"
                                TargetMachine="1"
                        />
                                Name="VCAppVerifierTool"
                        />
                        <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
index c02faff..2a86767 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
index f9c28dd..81706b7 100644 (file)
@@ -20,8 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
index 891f4a1..6688448 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
index c6a8b44..a092667 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
index 5c2279a..d3c8d7b 100644 (file)
@@ -20,8 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
index 5b10c37..8389abf 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
index 2a322ec..7312fac 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
index 02f3004..c16bbd5 100644 (file)
@@ -20,8 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
index efdfbb5..f9dbebb 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
index 664fd7e..34bfc52 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
index eb2c104..b3ae647 100644 (file)
@@ -20,8 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
index eb01479..9312d50 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
index 7a55c64..74b76ff 100755 (executable)
@@ -256,16 +256,14 @@ aShape = Transformer.Shape();
   // display original shape in shaded display mode
   Handle_AIS_Shape aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
   getAISContext()->SetDisplayMode(aShapeIO, AIS_Shaded, Standard_False);
+  // Set increased polygon offset for the main shape to avoid depth collision with textured faces
+  aShapeIO->SetPolygonOffsets(Aspect_POM_Fill, 1.5, 0.5);
   DISP(aShapeIO);
 
   Handle_AIS_TexturedShape aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
-  //offset visual shape to avoid overlapping
-  aTFace1->SetPolygonOffsets(Aspect_POM_Fill, 0.99, -2.0);
   DISP(aTFace1);
 
   Handle_AIS_TexturedShape aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
-  //offset a visual shape to avoid overlapping
-  aTFace2->SetPolygonOffsets(Aspect_POM_Fill, 0.99, -2.0);
   DISP(aTFace2);
 
   getViewer()->Update();
index ef6bc35..3a024e7 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
index 158eb2d..819de37 100644 (file)
@@ -20,8 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
index d87a911..bf51b00 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
index 7368794..05459c0 100644 (file)
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
index f3b1ed2..c752bde 100644 (file)
@@ -20,8 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
                                PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-                       IntermediateDirectory=".\$(OS_TYPE)\objd"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+                       IntermediateDirectory=".\win$(ARCH)\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
+                               TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
                                PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-                               ObjectFile=".\$(OS_TYPE)\objd/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\objd/"
+                               ObjectFile=".\win$(ARCH)\objd/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
index 25375e4..1f6324f 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-                               ObjectFile=".\$(OS_TYPE)\obj/"
-                               ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win$(ARCH)\obj/"
+                               ObjectFile=".\win$(ARCH)\obj/"
+                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-                               ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-                       IntermediateDirectory=".\$(OS_TYPE)\obj"
+                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+                       IntermediateDirectory=".\win$(ARCH)\obj&