0022849: Bad import of a STEP file (error during triangulation)

2025-09-03 14:10:33 +03:00 · 2012-03-15 12:56:23 +04:00
22386 changed files with 95716 additions and 393045 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@

-# standard directories for derived files in CASROOT
+# /
 /.adm
 /sun
 /lin
-/mac
 /ao1
 /sil
 /wnt
@@ -13,33 +12,6 @@
 /win32
 /win64

-# project files and artifacts
-/adm/msvc
-/adm/wnt/cbp
-/adm/mac
-/adm/make
-*.vcproj*user
-*.ncb
-*.suo
-
-# test results
-/results*
-
-# Emacs backup files
-*~
-
-#Generated files
-*.in
-/*.am
-/*.m4
-/*.ac
-/*.sh
-/*.bat
-/autom4te.cache
-/build_configure
-/configure
-/make
-/config.*
-/Makefile
-/libtool
-/stamp*
+# /adm/
+/adm/win32
+/adm/win64
--- a/151
+++ b/151
@@ -1,151 +0,0 @@
-Open CASCADE Technology Public License
-License version: 6.5 March, 2011
-
-Open CASCADE S.A.S. releases and makes publicly available the source code of the software Open CASCADE Technology to the free software development community under the terms and conditions of this license.
-
-It is not the purpose of this license to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this license has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-
-Please read this license carefully and completely before downloading this software. By downloading, using, modifying, distributing and sublicensing this software, you indicate your acceptance to be bound by the terms and conditions of this license. If you do not want to accept or cannot accept for any reasons the terms and conditions of this license, please do not download or use in any manner this software.
-
-1. Definitions
-
-Unless there is something in the subject matter or in the context inconsistent therewith, the capitalized terms used in this License shall have the following meaning.
-
-"Applicable Intellectual Property Rights" means (a) with respect to the Initial Developer, any rights under patents or patents applications or other intellectual property rights that are now or hereafter acquired, owned by or assigned to the Initial Developer and that cover subject matter contained in the Original Code, but only to the extent necessary to use, reproduce, modify, distribute or sublicense the Original Code without infringement; and (b) with respect to You or any Contributor, any rights under patents or patents applications or other intellectual property rights that are now or hereafter acquired, owned by or assigned to You or to such Contributor and that cover subject matter contained in Your Modifications or in such Contributor's Modifications, taken alone or in combination with Original Code.
-
-"Contributor" means each individual or legal entity that creates or contributes to the creation of any Modification, including the Initial Developer.
-
-"Derivative Program": means a new program combining the Software or portions thereof with other source code not governed by the terms of this License.
-
-"Initial Developer": means Open CASCADE S.A.S., with main offices   at 1, place des Fr<46>res Montgolfier, 78280 Guyancourt, France.
-
-"Modifications": mean any addition to, deletion from or change to the substance or the structure of the Software. When source code of the Software is released as a series of files, a Modification is: (a) any addition to, deletion from or change to the contents of a file containing the Software or (b) any new file or other representation of computer program statements that contains any part of the Software. By way of example, Modifications include any debug of, or improvement to, the Original Code or any of its components or portions as well as its next versions or releases thereof.
-
-"Original Code": means (a) the source code of the software Open CASCADE Technology originally made available by the Initial Developer under this License, including the source code of any updates or upgrades of the Original Code and (b) the object code compiled from such source code and originally made available by Initial Developer under this License.
-
-"Software": means the Original Code, the Modifications, the combination of Original Code and any Modifications or any respective portions thereof.
-
-"You" or "Your": means an individual or a legal entity exercising rights under this License.
-
-
-2. Acceptance of license
-
-By using, reproducing, modifying, distributing or sublicensing the Software or any portion thereof, You expressly indicate Your acceptance of the terms and conditions of this License and undertake to act in accordance with all the provisions of this License applicable to You.
-
-
-3. Scope and purpose
-
-This License applies to the Software and You may not use, reproduce, modify, distribute, sublicense or circulate the Software, or any portion thereof, except as expressly provided under this License. Any attempt to otherwise use, reproduce, modify, distribute or sublicense the Software is void and will automatically terminate Your rights under this License.
-
-
-4. Contributor license
-
-Subject to the terms and conditions of this License, the Initial Developer and each of the Contributors hereby grant You a world-wide, royalty-free, irrevocable and non-exclusive license under the Applicable Intellectual Property Rights they own or control, to use, reproduce, modify, distribute and sublicense the Software provided that:
-
-You reproduce in all copies of the Software the copyright and other proprietary notices and disclaimers of the Initial Developer as they appear in the Original Code and attached hereto as Schedule "A" and any other notices or disclaimers attached to the Software and keep intact all notices in the Original Code that refer to this License and to the absence of any warranty;
-You include a copy of this License with every copy of the Software You distribute;
-If you distribute or sublicense the Software (as modified by You or on Your behalf as the case may be), You cause such Software to be licensed as a whole, at no charge, to all third parties, under the terms and conditions of the License, making in particular available to all third parties the source code of the Software;
-You document all Your Modifications, indicate the date of each such Modifications, designate the version of the Software You used, prominently include a file carrying such information with respect to the Modifications and duplicate the copyright and other proprietary notices and disclaimers attached hereto as Schedule "B" or any other notices or disclaimers attached to the Software with your Modifications.
-
-For greater certainty, it is expressly understood that You may freely create Derivative Programs (without any obligation to publish such Derivative Program) and distribute same as a single product. In such case, You must ensure that all the requirements of this License are fulfilled for the Software or any portion thereof.
-
-
-5. Your license
-
-You hereby grant all Contributors and anyone who becomes a party under this License a world-wide, non-exclusive, royalty-free and irrevocable license under the Applicable Intellectual Property Rights owned or controlled by You, to use, reproduce, modify, distribute and sublicense all Your Modifications under the terms and conditions of this License.
-
-
-6. Software subject to license
-
-Your Modifications shall be governed by the terms and conditions of this License. You are not authorized to impose any other terms or conditions than those prevailing under this License when You distribute and/or sublicense the Software, save and except as permitted under Section 7 hereof.
-
-
-7. Additional terms
-
-You may choose to offer, on a non-exclusive basis, and to charge a fee for any warranty, support, maintenance, liability obligations or other rights consistent with the scope of this License with respect to the Software (the "Additional Terms") to the recipients of the Software. However, You may do so only on Your own behalf and on Your sole and exclusive responsibility. You must obtain the recipient's agreement that any such Additional Terms are offered by You alone, and You hereby agree to indemnify, defend and hold the Initial Developer and any Contributor harmless for any liability incurred by or claims asserted against the Initial Developer or any Contributors with respect to any such Additional Terms.
-
-
-8. Disclaimer of warranty
-
-The Software is provided under this License on an "as is" basis, without warranty of any kind, including without limitation, warranties that the Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Software is with You.
-
-
-9. Liability
-
-Under no circumstances shall You, the Initial Developer or any Contributor be liable to any person for any direct or indirect damages of any kind including, without limitation, damages for loss of goodwill, loss of data, work stoppage, computer failure or malfunction or any and all other commercial damages or losses resulting from or relating to this License or indirectly to the use of the Software.
-
-
-10. Trademark
-
-This License does not grant any rights to use the trademarks, trade names and domain names "MATRA", "EADS Matra Datavision", "CAS.CADE", "Open CASCADE", "opencascade.com" and "opencascade.org" or any other trademarks, trade names or domain names used or owned by the Initial Developer.
-
-
-11. Copyright
-
-The Initial Developer retains all rights, title and interest in and to the Original Code. You may not remove the copyright <20> notice which appears when You download the Software.
-
-
-12. Term
-
-This License is granted to You for a term equal to the remaining period of protection covered by the intellectual property rights applicable to the Original Code.
-
-
-13. Termination
-
-In case of termination, as provided in Section 3 above, You agree to immediately stop any further use, reproduction, modification, distribution and sublicensing of the Software and to destroy all copies of the Software that are in Your possession or control. All sublicenses of the Software which have been properly granted prior to termination shall survive any termination of this License. In addition, Sections 5, 8 to 11, 13.2 and 15.2 of this License, in reason of their nature, shall survive the termination of this License for a period of fifteen (15) years.
-
-
-14. Versions of the license
-
-The Initial Developer may publish new versions of this License from time to time. Once Original Code has been published under a particular version of this License, You may choose to continue to use it under the terms and conditions of that version or use the Original Code under the terms of any subsequent version of this License published by the Initial Developer.
-
-
-15. Miscellaneous
-
-15.1 Relationship of Parties
-
-This License will not be construed as creating an agency, partnership, joint venture or any other form of legal association between You and the Initial Developer, and You will not represent to the contrary, whether expressly, by implication or otherwise.
-
-15.2 Independent Development
-
-Nothing in this License will impair the Initial Developer's right to acquire, license, develop, have others develop for it, market or distribute technology or products that perform the same or similar functions as, or otherwise compete with, Modifications, Derivative Programs, technology or products that You may develop, produce, market or distribute.
-
-15.3 Severability
-
-If for any reason a court of competent jurisdiction finds any provision of this License, or portion thereof, to be unenforceable, that provision of the License will be enforced to the maximum extent permissible so as to effect the economic benefits and intent of the parties, and the remainder of this License will continue in full force and extent.
-
-
-END OF THE TERMS AND
-CONDITIONS OF THIS LICENSE
-
-
-Open CASCADE S.A.S. is a French soci<63>t<EFBFBD> par actions simplifi<66>e having its   main offices at 1, place des Fr<46>res Montgolfier, 78280 Guyancourt, France. Its web site is located at the following address www.opencascade.com
-
-
-Open CASCADE Technology Public License
-
-Schedule "A"
-
-The content of this file is subject to the Open CASCADE Technology Public License Version 6.5 (the "License"). You may not use the content of this file except in compliance with the License. Please obtain a copy of the License at http://www.opencascade.org and read it completely before using this file.
-
-The Initial Developer of the Original Code is Open CASCADE S.A.S., with main offices at  1, place des Fr<46>res Montgolfier, 78280 Guyancourt, France. The Original Code is copyright <20> Open CASCADE S.A.S., 2001. All rights reserved.
-
-"The Original Code and all software distributed under the License are distributed on an "AS IS" basis, without warranty of any kind, and the Initial Developer hereby disclaims all such warranties, including without limitation, any warranties of merchantability, fitness for a particular purpose or non-infringement. Please see the License for the specific terms and conditions governing rights and limitations under the License".
-
-End of Schedule "A"
-
-
-Open CASCADE Technology Public License 
-
-Schedule "B"
-
-"The content of this file is subject to the Open CASCADE Technology Public License Version 6.5 (the "License"). You may not use the content of this file except in compliance with the License. Please obtain a copy of the License at http://www.opencascade.org and read it completely before using this file.
-
-The Initial Developer of the Original Code is Open CASCADE S.A.S., with main offices at  1, place des Fr<46>res Montgolfier, 78280 Guyancourt, France. The Original Code is copyright <20> Open CASCADE S.A.S., 2001. All rights reserved.
-
-Modifications to the Original Code have been made by ________________________. Modifications are copyright <20> [Year to be included]. All rights reserved.
-
-The software Open CASCADE Technology and all software distributed under the License are distributed on an "AS IS" basis, without warranty of any kind, and the Initial Developer hereby disclaims all such warranties, including without limitation, any warranties of merchantability, fitness for a particular purpose or non-infringement. Please see the License for the specific terms and conditions governing rights and limitations under the License".
-
-End of Schedule "B"
--- a/44
+++ b/44
@@ -1,44 +0,0 @@
-               Open CASCADE Technology source repository
-               -----------------------------------------
-
-This directory contains sources of Open CASCADE Technology (OCCT), a collection
-of C++ libraries providing services for 3D surface and solid modeling, CAD data
-exchange, and visualization. OCCT can be best applied in development of
-software dealing with 3D modeling (CAD), manufacturing / measuring (CAM) or
-numerical simulation (CAE).
-
-The OCCT code is subject to the Open CASCADE Technology Public License Version
-6.5 (the "License"). You may not use the content of the relevant files except in
-compliance with the License. Please see the LICENSE file or obtain a copy of the
-License at http://www.opencascade.org and read it completely before using this
-software.
-
-In order to build OCCT libraries from these sources for use in your program, 
-you need to:
-
-1. Download, build, and install the required third-party libraries.
-
-   Follow the instructions provided in the documents titled "Building 3rd party
-   products for OCCT" on http://dev.opencascade.org/?q=home/resources for
-   installation and building.
-
-2. Install and configure WOK development environment.
-
-   See http://dev.opencascade.org/?q=home/resources for the latest build of the 
-   WOK and instructions of configuring it.
-
-3. Use WOK to generate build scripts or project files for your compiler,
-   then build the libraries.
-
-Note that you may use also the pre-processed source packages that include
-makefiles and projects, or binary packages, available for official releases of
-OCCT at http://www.opencascade.org. In this case however you will not be able
-to re-generate derived files after changing the CDL files (requires WOK).
-
-The current version of OCCT can be consulted in the file
-src/Standard/Standard_Version.hxx
-
-For more information regarding OCCT code development please consult the official
-OCCT Collaborative Development Portal:
-
-                        http://dev.opencascade.org
--- a/adm/QA.tcl
+++ b/adm/QA.tcl
@@ -0,0 +1,10 @@
+global tcl_platform
+
+if {[array get env QA_DUMP] != "" && $env(QA_DUMP) == "1"} {
+    puts "QA commands have been loaded"
+    set env(QADEFAULT) $env(CASROOT)/src/QAResources/QADrawAppliInit
+    set env(QA_LD_LIBRARY_PATH) $env(CASROOT)/sun/lib/.
+    set env(DRAWDEFAULTOLD) $env(DRAWDEFAULT)
+    set env(DRAWDEFAULT) "$env(QADEFAULT)"
+    set env(CSF_DrawPluginQADefaults) $env(CASROOT)/src/QAResources/.
+}
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -492,13 +492,33 @@ t TKXDEDRAW
 t TKXSDRAW
 x DRAWEXE
 p DebugTools
+p QAAMINO
+p QAAlcatel
+p QABRGM
+p QABUC
+p QACADCAM
+p QADBMReflex
 p QADraw
+p QAInsynchro
+p QAMARTEC
+p QAMitutoyoUK
+p QAMitutoyoUS
 p QANCollection
+p QANIC
 p QANewBRepNaming
 p QANewDBRepNaming
 p QANewModTopOpe
+p QAOCC
+p QAQuickPen
+p QARicardo
+p QARina
+p QARoutelous
+p QASamtech
+p QATelco
+p QAUsinor
 p QAViewer2dTest
+p QAYasaki
 r QAResources
 t TKQADraw
+p QACEADRT
 p QADNaming
-p QABugs
--- a/samples/CSharp/IE/IE.csproj
+++ b/samples/CSharp/IE/IE.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
@@ -25,8 +25,6 @@
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <ApplicationRevision>0</ApplicationRevision>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <OutputPath>bin\Debug\</OutputPath>
--- a/samples/CSharp/IE/IE.sln
+++ b/samples/CSharp/IE/IE.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 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}"
--- a/samples/CSharp/OCC/OCC.vcproj
+++ b/samples/CSharp/OCC/OCC.vcproj
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="8,00"
 	Name="OCC"
 	ProjectGUID="{DCB139CF-2190-412E-B72F-8B080CC01422}"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -42,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="$(CASROOT)\inc"
 				PreprocessorDefinitions="WNT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -66,14 +65,12 @@
 				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="$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				ProgramDatabaseFile="$(OutDir)/OCC.pdb"
 				SubSystem="2"
 				ResourceOnlyDLL="false"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/OCC.lib"
 				TargetMachine="1"
 			/>
@@ -95,6 +92,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -125,7 +125,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="$(CASROOT)\inc"
 				PreprocessorDefinitions="WNT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -147,13 +147,11 @@
 				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="$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/OCC.lib"
 				TargetMachine="1"
 			/>
@@ -175,6 +173,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
--- a/samples/CSharp/Run_MSVC.bat
+++ b/samples/CSharp/Run_MSVC.bat
@@ -0,0 +1,19 @@
+@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^)
+)
+
--- a/samples/CSharp/env.bat
+++ b/samples/CSharp/env.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+call "%~dp0..\..\ros\env.bat"
--- a/samples/CSharp/msvc.bat
+++ b/samples/CSharp/msvc.bat
@@ -1,3 +0,0 @@
-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
--- a/samples/CSharp/run.bat
+++ b/samples/CSharp/run.bat
@@ -1,4 +0,0 @@
-call ../../env.bat %1 %2 %3
-if not ["%CASDEB%"] == [""] set "BinDir=Debug"
-if ["%CASDEB%"] == [""] set "BinDir=Release"
-%~dp0IE\bin\%BinDir%\IE.exe
--- a/samples/CSharp/shell/shell.vcproj
+++ b/samples/CSharp/shell/shell.vcproj
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="8,00"
 	Name="shell"
 	ProjectGUID="{969912D9-78E7-4AB8-B4FF-6B52B4F03991}"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -42,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\OCC\;$(CASROOT)\inc"
 				PreprocessorDefinitions="WNT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -66,13 +65,11 @@
 				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);$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CASROOT)\win32\lib"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				ProgramDatabaseFile="$(OutDir)/shell.pdb"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/shell.lib"
 				TargetMachine="1"
 			/>
@@ -94,6 +91,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -124,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\OCC\;$(CASROOT)\inc"
 				PreprocessorDefinitions="WNT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -146,13 +146,11 @@
 				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);$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CASROOT)\win32\vc8\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/shell.lib"
 				TargetMachine="1"
 			/>
@@ -174,6 +172,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
--- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Geometry.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(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>.\win32\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,11 +113,11 @@
    </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>../../../../win32\vc10\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -128,24 +128,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Geometry.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(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>.\x64\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -156,11 +156,11 @@
    </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>../../../../x64\vc10\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -171,22 +171,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Geometry.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(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>.\win32\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <BrowseInformation>true</BrowseInformation>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -199,12 +199,12 @@
    </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>../../../../win32\vc10\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -215,22 +215,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Geometry.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(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>.\x64\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <BrowseInformation>true</BrowseInformation>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -243,12 +243,12 @@
    </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>../../../..\x64\vc10\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Geometry.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,12 +82,12 @@
 			<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="../../../..\win32\vc8\bin/Geometry.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,24 +144,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Geometry.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -180,12 +180,12 @@
 			<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="../../../..\x64\vc8\bin/Geometry.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -216,8 +216,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -242,22 +242,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Geometry.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -278,13 +278,13 @@
 			<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="../../../..\win32\vc8\bind/Geometry.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -315,8 +315,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -341,22 +341,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Geometry.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -377,13 +377,13 @@
 			<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="../../../..\\x64\vc8\bind/Geometry.exe"
+				OutputFile="../../../..\\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Geometry.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,12 +83,12 @@
 			<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="../../../..\win32\vc9\bin/Geometry.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,24 +144,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Geometry.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -180,12 +180,12 @@
 			<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="../../../..\x64\vc9\bin/Geometry.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -215,8 +215,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -241,22 +241,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Geometry.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -277,13 +277,13 @@
 			<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="../../../..\win32\vc9\bind/Geometry.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -313,8 +313,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -339,22 +339,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Geometry.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Geometry.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -375,13 +375,13 @@
 			<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="../../../..\\x64\vc9\bind/Geometry.exe"
+				OutputFile="../../../..\\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,22 +85,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/TopologyTransformations.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(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>.\win32\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -112,11 +112,11 @@
    </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>../../../../win32\vc10\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,22 +127,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/TopologyTransformations.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(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>.\x64\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -154,11 +154,11 @@
    </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>../../../../x64\vc10\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,24 +169,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/TopologyTransformations.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(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>.\win32\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -197,10 +197,10 @@
    </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>../../../../win32\vc10\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,24 +211,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/TopologyTransformations.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(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>.\x64\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -239,10 +239,10 @@
    </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>../../../../x64\vc10\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,22 +46,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -81,12 +81,12 @@
 			<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="../../../..\win32\vc8\bind/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<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="../../../..\x64\vc8\bind/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,24 +240,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -276,11 +276,11 @@
 			<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="../../../..\win32\vc8\bin/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,24 +337,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -373,11 +373,11 @@
 			<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="../../../..\x64\vc8\bin/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,22 +47,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -82,12 +82,12 @@
 			<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="../../../..\win32\vc9\bind/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<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="../../../..\x64\vc9\bind/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,24 +239,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -275,11 +275,11 @@
 			<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="../../../..\win32\vc9\bin/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,24 +335,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -371,11 +371,11 @@
 			<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="../../../..\x64\vc9\bin/Modeling.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer2d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\win32\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
    </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>../../../../win32\vc10\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,24 +127,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer2d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\x64\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
    </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>../../../../x64\vc10\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,22 +169,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer2d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\win32\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
    </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>../../../../win32\vc10\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,22 +211,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer2d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\x64\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
    </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>../../../../x64\vc10\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<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="../../../..\win32\vc8\bin/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc8\bin/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<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="../../../..\win32\vc8\bind/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<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="../../../..\x64\vc8\bind/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<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="../../../..\win32\vc9\bin/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc9\bin/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<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="../../../..\win32\vc9\bind/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Viewer2d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<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="../../../..\x64\vc9\bind/Viewer2d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer3d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\win32\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
    </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>../../../../win32\vc10\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,24 +127,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer3d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\x64\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
    </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>../../../../x64\vc10\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,22 +169,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer3d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\win32\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <BrowseInformation>true</BrowseInformation>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -197,11 +197,11 @@
    </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>../../../../win32\vc10\bind/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -212,22 +212,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer3d.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\x64\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <BrowseInformation>true</BrowseInformation>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -240,11 +240,11 @@
    </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>../../../../x64\vc10\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<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="../../../..\win32\vc8\bin/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc8\bin/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -276,12 +276,12 @@
 			<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="../../../..\win32\vc8\bind/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -312,8 +312,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -338,22 +338,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -374,12 +374,12 @@
 			<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="../../../..\x64\vc8\bind/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<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="../../../..\win32\vc9\bin/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc9\bin/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -275,12 +275,12 @@
 			<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="../../../..\win32\vc9\bind/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -310,8 +310,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -336,22 +336,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Viewer3d.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -372,12 +372,12 @@
 			<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="../../../..\x64\vc9\bin/Viewer3d.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
@@ -187,12 +187,12 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
 void COffsetDlg::UpdateValues()
 {
 	Standard_Integer aOffsetMode;
-	Standard_ShortReal aBoxFactor = 0;
-	Standard_ShortReal aCylFactor = 0;
-	Standard_ShortReal aSphereFactor = 0;
-	Standard_ShortReal aCylUnits = 0;
-	Standard_ShortReal aSphereUnits = 0;
-	Standard_ShortReal aBoxUnits = 0;
+	Standard_Real aBoxFactor = 0;
+	Standard_Real aCylFactor = 0;
+	Standard_Real aSphereFactor = 0;
+	Standard_Real aCylUnits = 0;
+	Standard_Real aSphereUnits = 0;
+	Standard_Real aBoxUnits = 0;

 	Handle(AIS_InteractiveContext) aAISContext = myDoc->GetAISContext();

--- a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
@@ -256,14 +256,16 @@ 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();
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
@@ -348,10 +348,10 @@ void CViewer3dDoc::OnPolygonOffsets()
 void CViewer3dDoc::OnUpdatePolygonOffsets(CCmdUI* pCmdUI) 
 {
 	Standard_Integer aOffsetMode;
-	Standard_ShortReal aFactor;
-	Standard_ShortReal aCylUnits = 0;
-	Standard_ShortReal aSphereUnits = 0;
-	Standard_ShortReal aBoxUnits = 0;
+	Standard_Real aFactor;
+	Standard_Real aCylUnits = 0;
+	Standard_Real aSphereUnits = 0;
+	Standard_Real aBoxUnits = 0;

 	BOOL IsOverlappedCylinderDisplayed = myAISContext->IsDisplayed(myOverlappedCylinder);
 	BOOL IsOverlappedSphereDisplayed = myAISContext->IsDisplayed(myOverlappedSphere);
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/ImportExport.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\win32\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
    </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>../../../../win32\vc10\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,24 +127,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/ImportExport.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\x64\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
    </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>../../../../x64\vc10\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,22 +169,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/ImportExport.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\win32\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
    </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>../../../../win32\vc10\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,22 +211,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/ImportExport.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\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>.\x64\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
    </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>../../../../x64\vc10\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/ImportExport.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<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="../../../../win32\vc8\bin/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../../win32\vc8\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../x64\vc8\bin"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/ImportExport.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../../x64\vc8\bin/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../../x64\vc8\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/ImportExport.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<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="../../../../win32\vc8\bind/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../win32\vc8\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/ImportExport.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<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="../../../../x64\vc8\bind/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../x64\vc8\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/ImportExport.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<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="../../../../win32\vc9\bin/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../../win32\vc9\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../x64\vc9\bin"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/ImportExport.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../../x64\vc9\bin/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../../x64\vc9\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/ImportExport.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<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="../../../../win32\vc9\bind/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../win32\vc9\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/ImportExport.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/ImportExport.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<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="../../../../x64\vc9\bind/ImportExport.exe"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../x64\vc9\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Ocaf.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\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>.\win32\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
    </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>../../../../win32\vc10\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,24 +127,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Ocaf.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\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>.\x64\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
    </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>../../../../x64\vc10\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,22 +169,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Ocaf.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\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>.\win32\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
    </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>../../../../win32\vc10\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,22 +211,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Ocaf.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\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>.\x64\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
    </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>../../../../x64\vc10\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\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=".\win32\obj/Ocaf.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<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="../../../..\win32\vc8\bin/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\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=".\x64\obj/Ocaf.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc8\bin/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Ocaf.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<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="../../../..\win32\vc8\bind/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Ocaf.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<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="../../../..\x64\vc8\bind/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\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=".\win32\obj/Ocaf.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<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="../../../..\win32\vc9\bin/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\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=".\x64\obj/Ocaf.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc9\bin/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Ocaf.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<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="../../../..\win32\vc9\bind/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Ocaf.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Ocaf.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<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="../../../..\x64\vc9\bind/Ocaf.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Triangulation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(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>.\win32\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
    </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;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;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,24 +127,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Triangulation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(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>.\x64\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
    </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;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;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,22 +169,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Triangulation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(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>.\win32\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
    </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;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;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,22 +211,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Triangulation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(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>.\x64\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
    </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;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;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Triangulation.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc8\bin/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Triangulation.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc8\bin/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Triangulation.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc8\bind/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Triangulation.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc8\bind/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Triangulation.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc9\bin/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Triangulation.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc9\bin/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Triangulation.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc9\bind/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Triangulation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Triangulation.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<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 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 TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc9\bind/Triangulation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/HLR.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(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>.\win32\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
    </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>../../../../win32\vc10\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,24 +127,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/HLR.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(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>.\x64\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
    </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>../../../../x64\vc10\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,22 +169,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/HLR.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(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>.\win32\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
    </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>../../../../win32\vc10\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,22 +211,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/HLR.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(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>.\x64\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
    </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>../../../../x64\vc10\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/HLR.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<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="../../../..\win32\vc8\bin/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/HLR.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/HLR.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc8\bin/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/HLR.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/HLR.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<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="../../../..\win32\vc8\bind/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/HLR.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<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="../../../..\x64\vc8\bind/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/HLR.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<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="../../../..\win32\vc9\bin/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/HLR.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/HLR.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<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="../../../..\x64\vc9\bin/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/HLR.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/HLR.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<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="../../../..\win32\vc9\bind/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/HLR.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/HLR.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<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="../../../..\x64\vc9\bind/HLR.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,22 +85,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Animation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\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>.\win32\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -112,11 +112,11 @@
    </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;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -127,22 +127,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Animation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\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>.\x64\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -154,11 +154,11 @@
    </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;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@@ -169,24 +169,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Animation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win32\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -197,10 +197,10 @@
    </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;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -211,24 +211,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Animation.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\..\;..\..\..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\;..\..\..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -240,10 +240,10 @@
    </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;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,22 +46,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Animation.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -81,12 +81,12 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\win32\vc8\bind/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Animation.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\x64\vc8\bind/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,24 +240,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Animation.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -276,11 +276,11 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\win32\vc8\bin/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Animation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,24 +337,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Animation.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -373,11 +373,11 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\x64\vc8\bin/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Animation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,22 +47,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/Animation.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -82,12 +82,12 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\win32\vc9\bind/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/Animation.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\x64\vc9\bind/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,24 +239,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/Animation.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -275,11 +275,11 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\win32\vc9\bin/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Animation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,24 +335,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Animation.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/Animation.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -371,11 +371,11 @@
 			<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 TKBO.lib"
-				OutputFile="../../../..\x64\vc9\bin/Animation.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Animation.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,14 +85,14 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Convert.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -100,10 +100,10 @@
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win32\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -114,11 +114,11 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\win32\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../win32\vc10\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>false</OptimizeReferences>
      <TargetMachine>MachineX86</TargetMachine>
@@ -130,14 +130,14 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/Convert.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -145,10 +145,10 @@
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -159,11 +159,11 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\x64\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>false</OptimizeReferences>
      <TargetMachine>MachineX64</TargetMachine>
@@ -175,23 +175,23 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Convert.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win32\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -203,12 +203,12 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\win32\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -219,23 +219,23 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/Convert.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -247,12 +247,12 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\x64\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
--- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc8\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\win32\obj/Convert.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,12 +82,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc8\bin/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-				ManifestFile=".\win32\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\win32\vc8\bin/Convert.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				TargetMachine="1"
@@ -119,8 +119,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc8\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -145,24 +145,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\x64\obj/Convert.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -181,12 +181,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc8\bin/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-				ManifestFile=".\x64\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\x64\vc8\bin/Convert.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				TargetMachine="17"
@@ -218,8 +218,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc8\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -244,22 +244,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\win32\objd/Convert.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -279,13 +279,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc8\bind/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
-				ManifestFile=".\win32\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc8\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -316,8 +316,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc8\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -342,22 +342,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\x64\objd/Convert.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -377,13 +377,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc8\bind/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
-				ManifestFile=".\x64\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc8\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
--- a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\win32\vc9\bin"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\win32\obj/Convert.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,12 +83,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc9\bin/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
-				ManifestFile=".\win32\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\win32\vc9\bin/Convert.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				RandomizedBaseAddress="1"
@@ -119,8 +119,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\x64\vc9\bin"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -145,24 +145,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\x64\obj/Convert.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -181,12 +181,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc9\bin/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-				ManifestFile=".\x64\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\x64\vc9\bin/Convert.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				RandomizedBaseAddress="1"
@@ -217,8 +217,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\win32\vc9\bind"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -243,22 +243,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\win32\objd/Convert.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -278,13 +278,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\win32\vc9\bind/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
-				ManifestFile=".\win32\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\win32\vc9\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -314,8 +314,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\x64\vc9\bind"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -340,22 +340,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/Convert.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\x64\objd/Convert.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -375,13 +375,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\x64\vc9\bind/Convert.exe"
+				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
-				ManifestFile=".\x64\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\x64\vc9\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/All-vc10.sln
+++ b/samples/mfc/standard/All-vc10.sln
@@ -1,26 +1,26 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc10\Geometry.vcxproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\%VCVER%\Geometry.vcxproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc10\Modeling.vcxproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\%VCVER%\Modeling.vcxproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc10\Viewer2d.vcxproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\%VCVER%\Viewer2d.vcxproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc10\Viewer3d.vcxproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\%VCVER%\Viewer3d.vcxproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc10\ImportExport.vcxproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\%VCVER%\ImportExport.vcxproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc10\Ocaf.vcxproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\%VCVER%\Ocaf.vcxproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc10\Triangulation.vcxproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\%VCVER%\Triangulation.vcxproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc10\HLR.vcxproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\%VCVER%\HLR.vcxproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc10\Animation.vcxproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\%VCVER%\Animation.vcxproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc10\mfcsample.vcxproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\%VCVER%\mfcsample.vcxproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc10\Convert.vcxproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\%VCVER%\Convert.vcxproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/samples/mfc/standard/All-vc8.sln
+++ b/samples/mfc/standard/All-vc8.sln
@@ -1,53 +1,53 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc8\Geometry.vcproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\%VCVER%\Geometry.vcproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc8\Modeling.vcproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\%VCVER%\Modeling.vcproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc8\Viewer2d.vcproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\%VCVER%\Viewer2d.vcproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc8\Viewer3d.vcproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\%VCVER%\Viewer3d.vcproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc8\ImportExport.vcproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\%VCVER%\ImportExport.vcproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc8\Ocaf.vcproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\%VCVER%\Ocaf.vcproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc8\Triangulation.vcproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\%VCVER%\Triangulation.vcproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc8\HLR.vcproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\%VCVER%\HLR.vcproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc8\Animation.vcproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\%VCVER%\Animation.vcproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc8\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\%VCVER%\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc8\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\%VCVER%\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
--- a/samples/mfc/standard/All-vc9.sln
+++ b/samples/mfc/standard/All-vc9.sln
@@ -1,53 +1,53 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc9\Geometry.vcproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\%VCVER%\Geometry.vcproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc9\Modeling.vcproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\%VCVER%\Modeling.vcproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc9\Viewer2d.vcproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\%VCVER%\Viewer2d.vcproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc9\Viewer3d.vcproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\%VCVER%\Viewer3d.vcproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc9\ImportExport.vcproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\%VCVER%\ImportExport.vcproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc9\Ocaf.vcproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\%VCVER%\Ocaf.vcproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc9\Triangulation.vcproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\%VCVER%\Triangulation.vcproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc9\HLR.vcproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\%VCVER%\HLR.vcproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc9\Animation.vcproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\%VCVER%\Animation.vcproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc9\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\%VCVER%\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc9\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\%VCVER%\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
 	EndProjectSection
--- a/samples/mfc/standard/Common/User_Cylinder.cxx
+++ b/samples/mfc/standard/Common/User_Cylinder.cxx
@@ -9,7 +9,6 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)

 #include "ColoredMeshDlg.h"

-#include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_StructureManager.hxx>
 #include <PrsMgr_PresentationManager3d.hxx>
 #include <BRepMesh.hxx>
@@ -314,8 +313,6 @@ void User_Cylinder::Compute(const Handle_PrsMgr_PresentationManager3d& aPresenta
 				}
 			}	

-			Handle(Graphic3d_ArrayOfTriangles) aOP = new Graphic3d_ArrayOfTriangles(3 * nnn, 0, Standard_True, Standard_True);
-
 			for (nt = 1; nt <= nnn; nt++)					
 			{
 #ifdef DEBUG
@@ -328,27 +325,50 @@ void User_Cylinder::Compute(const Handle_PrsMgr_PresentationManager3d& aPresenta

 				if (TriangleIsValid (Nodes(n1),Nodes(n2),Nodes(n3)) )
 				{	// Associates a vertexNT to each node
-					
-					TColgp_Array1OfPnt Points(1,3);
+					Graphic3d_Array1OfVertexNC Points(1,3);
+					Aspect_Array1OfEdge aretes(1,3);

-					gp_Pnt p = Nodes(n1).Transformed(myLocation.Transformation());
-					gp_Pnt q = Nodes(n2).Transformed(myLocation.Transformation());
-					gp_Pnt r = Nodes(n3).Transformed(myLocation.Transformation());
+		
+					mygroup->BeginPrimitives();
+					{
+						gp_Pnt p = Nodes(n1).Transformed(myLocation.Transformation());
+						gp_Pnt q = Nodes(n2).Transformed(myLocation.Transformation());
+						gp_Pnt r = Nodes(n3).Transformed(myLocation.Transformation());
+
+						Points(1).SetCoord(p.X(), p.Y(), p.Z());
+						Points(2).SetCoord(q.X(), q.Y(), q.Z());
+						Points(3).SetCoord(r.X(), r.Y(), r.Z());
+
+				
+						Points(1).SetNormal(myNormal(n1).X(), myNormal(n1).Y(), myNormal(n1).Z());
+						Points(2).SetNormal(myNormal(n2).X(), myNormal(n2).Y(), myNormal(n2).Z());
+						Points(3).SetNormal(myNormal(n3).X(), myNormal(n3).Y(), myNormal(n3).Z());
+//ICI!!!
+/*						
+						Points(1).SetColor(Color(p,abs(int(B.Z())),abs(int(H.Z())),Dlg.Colorization));
+						Points(2).SetColor(Color(q,abs(int(B.Z())),abs(int(H.Z())),Dlg.Colorization));
+						Points(3).SetColor(Color(r,abs(int(B.Z())),abs(int(H.Z())),Dlg.Colorization));
+*/
+						Points(1).SetColor(Color(p,B.Z(),H.Z(),Dlg.Colorization));
+						Points(2).SetColor(Color(q,B.Z(),H.Z(),Dlg.Colorization));
+						Points(3).SetColor(Color(r,B.Z(),H.Z(),Dlg.Colorization));
+
+				
+			/*	Points(1).SetColor(Altitude(p,abs(B.Z()),abs(H.Z())));
+				Points(2).SetColor(Altitude(q,abs(B.Z()),abs(H.Z())));
+				Points(3).SetColor(Altitude(r,abs(B.Z()),abs(H.Z())));*/
+
+
+						aretes(1).SetValues(1, 2, Aspect_TOE_INVISIBLE);
+						aretes(2).SetValues(2, 3, Aspect_TOE_INVISIBLE);
+						aretes(3).SetValues(3, 1, Aspect_TOE_INVISIBLE);
+					}
+					mygroup->EndPrimitives();
+					mygroup->TriangleSet(Points, aretes, Standard_True);

-					Points(1).SetCoord(p.X(), p.Y(), p.Z());
-					Points(2).SetCoord(q.X(), q.Y(), q.Z());
-					Points(3).SetCoord(r.X(), r.Y(), r.Z());

-					aOP->AddVertex(Points(1), myNormal(n1), Color(p,B.Z(),H.Z(),Dlg.Colorization));
-					aOP->AddVertex(Points(2), myNormal(n2), Color(q,B.Z(),H.Z(),Dlg.Colorization));
-					aOP->AddVertex(Points(3), myNormal(n3), Color(r,B.Z(),H.Z(),Dlg.Colorization));
 				} // end of "if the triangle is valid
 			} // end of the "parcours" of the triangles
-
-			mygroup->BeginPrimitives();
-			mygroup->AddPrimitiveArray(aOP);
-			mygroup->EndPrimitives();
-
 			mygroup->SetGroupPrimitivesAspect(myAspect);
 		}// end of the exploration of the shape in faces

--- a/samples/mfc/standard/Run.bat
+++ b/samples/mfc/standard/Run.bat
@@ -0,0 +1,55 @@
+@ECHO OFF
+
+call %~dp0..\..\ros\env.bat
+
+if "%4" EQU "" (
+  echo Launch selected sample as follows: 
+  echo Run.bat [^vc8^|^vc9^|^vc10^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
+  echo Use option -d to run Debug mode
+  EXIT /B
+)
+
+SET VCVER=%1
+SET OS_TYPE=%2
+
+if not "%3" EQU "" (
+    if /I "%3" == "Release" (
+        set CASDEB=
+    ) else if /I "%3" == "Debug" (
+        set CASDEB=d
+    ) else (
+        echo Error: third argument ^(%3^) should specify build mode,
+        echo one of: Debug or Release
+        exit /B
+    )
+)
+
+IF not "%CASDEB%" EQU "" (
+	SET EXEDIR=%~dp0%OS_TYPE%\%VCVER%\bind
+	SET LIBDIR=%~dp0%OS_TYPE%\%VCVER%\libd
+	SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bind\TKOpenGl.dll
+) else (
+	SET EXEDIR=%~dp0%OS_TYPE%\%VCVER%\bin
+	SET LIBDIR=%~dp0%OS_TYPE%\%VCVER%\lib
+	SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bin\TKOpenGl.dll
+)
+
+SET PATH=%LIBDIR%;%BIN_DIR%;%PATH%
+
+SET RES_DIR=.\res
+
+set CSF_ResourcesDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
+set CSF_PluginDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
+
+IF NOT EXIST %EXEDIR%\%4.exe goto ERR_EXE
+
+start %EXEDIR%\%4.exe
+
+GOTO END
+
+:ERR_EXE
+ECHO Executable %EXEDIR%\%~n1.exe not found."
+ECHO Probably you didn't compile the application.
+EXIT /B
+
+:END
--- a/samples/mfc/standard/Run_MSVC.bat
+++ b/samples/mfc/standard/Run_MSVC.bat
@@ -0,0 +1,29 @@
+REM @ECHO OFF
+
+CALL "%~dp0env.bat" %1 %2 %3
+
+IF NOT DEFINED VCVER GOTO ERR_VCVER
+
+IF NOT DEFINED OS_TYPE GOTO ERR_OSTYPE
+
+IF %VCVER%==vc8 (
+start devenv.exe All-%VCVER%.sln /useenv
+) ELSE (
+IF %VCVER%==vc9 ( 
+start "MSDEV" "devenv.exe" All-%VCVER%.sln /useenv
+) ELSE (
+IF %VCVER%==vc10 (   
+start "MSDEV" "devenv.exe" All-%VCVER%.sln /useenv
+) ) )
+
+GOTO END
+
+:ERR_VCVER
+ECHO Environment variable "VCVER" has not been defined. Abort.
+GOTO END
+
+:ERR_OSTYPE
+ECHO Environment variable "OS_TYPE" has not been defined. Abort.
+GOTO END
+
+:END
--- a/samples/mfc/standard/env.bat
+++ b/samples/mfc/standard/env.bat
@@ -1,9 +1,79 @@
-IF not "%CASDEB%" EQU "" (
-SET BIN_DIR=win%ARCH%\%VCVER%\bind
-SET LIB_DIR=win%ARCH%\%VCVER%\libd
-) ELSE (
-SET BIN_DIR=win%ARCH%\%VCVER%\bin
-SET LIB_DIR=win%ARCH%\%VCVER%\lib
+@ECHO OFF
+
+rem Set environment for building OCCT mfc samples
+rem Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
+rem second argument specifies architecture) (win32 or win64)
+rem - third argument specifies build mode,
+
+rem Set build environment 
+call "%~dp0..\..\ros\env_build.bat" %1 %2
+
+rem Set build mode
+set CASDEB=d
+if not "%3" EQU "" (
+    if /I "%3" == "Release" (
+        set CASDEB=
+    ) else if /I "%3" == "Debug" (
+        set CASDEB=d
+    ) else (
+        echo Error: third argument ^(%3^) should specify build mode,
+        echo one of: Debug or Release
+        exit /B
+    )
+)
 )

-SET PATH=%~dp0%LIB_DIR%;%~dp0%BIN_DIR%;%PATH%
+rem Workaround for problems of building by VS2010 in 64 bit mode
+if /I "%VCVER%" == "vc10" (
+	if  "%ARCH%" == "64" (
+		echo Attention: The error can occured during the compilation in Visual Studio 2010, 
+		echo 		64 bit mode with embedding manifests ^(TRACKER : error TRK0002: Failed to execute command:^).
+		echo 		It's an error of Visual Studio 2010 which will be corrected in future versions of Visual Studio. 
+		echo		More details can be found here: 
+		echo 		https://connect.microsoft.com/VisualStudio/feedback/details/505682/x64-c-c-projects-cannot-compile
+	)
+)
+
+SET OS_TYPE=win%ARCH%
+
+IF NOT DEFINED CASROOT GOTO ERR_CASROOT
+
+IF NOT DEFINED OS_TYPE GOTO ERR_OSTYPE
+
+IF NOT EXIST "%CASROOT%\%OS_TYPE%\%VCVER%\bin\TKernel.dll" GOTO ERR_CASCADE
+
+IF not "%CASDEB%" EQU "" (
+SET CASLIBS=%CASROOT%\%OS_TYPE%\%VCVER%\bind
+SET BIN_DIR=%OS_TYPE%\%VCVER%\bind
+SET LIB_DIR=%OS_TYPE%\%VCVER%\libd
+SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bind\TKOpenGl.dll
+) ELSE (
+SET CASLIBS=%CASROOT%\%OS_TYPE%\%VCVER%\bin
+SET BIN_DIR=%OS_TYPE%\%VCVER%\bin
+SET LIB_DIR=%OS_TYPE%\%VCVER%\lib
+SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bin\TKOpenGl.dll
+)
+
+SET PATH=%~dp0%LIB_DIR%;%~dp0%BIN_DIR%;%CASLIBS%;%PATH%
+
+SET RES_DIR=.\res
+
+set CSF_ResourcesDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
+set CSF_PluginDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
+
+GOTO END
+
+:ERR_CASROOT
+ECHO Environment variable "CASROOT" has not been defined. Abort.
+EXIT /B
+
+:ERR_CASCADE
+ECHO Environment variable "CASROOT" defined incorrectly. Abort.
+EXIT /B
+
+:ERR_OSTYPE
+ECHO Environment variable "OS_TYPE" has not been defined. Abort.
+EXIT /B
+
+:END
+
--- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
@@ -66,17 +66,17 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,22 +85,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/mfcsample.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win32\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -112,11 +112,11 @@
    </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;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win32\vc10\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>
      </ImportLibrary>
@@ -129,22 +129,22 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\objd/mfcsample.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -156,11 +156,11 @@
    </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;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>
      </ImportLibrary>
@@ -173,24 +173,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win32\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/mfcsample.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win32\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win32\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -201,10 +201,10 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.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;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../win32\vc10\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win32\vc10\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>
      </ImportLibrary>
@@ -217,24 +217,24 @@
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\$(OS_TYPE)\obj/mfcsample.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
@@ -247,10 +247,10 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.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;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>
      </ImportLibrary>
--- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../win32\vc8\libd"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,22 +46,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/mfcsample.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -81,12 +81,12 @@
 			<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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../win32\vc8\libd/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../win32\vc8\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="1"
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../x64\vc8\libd"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,22 +144,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(CSF_OPT_INC)&quot;;..\..\..\..\Common"
+				AdditionalIncludeDirectories="&quot;$(CASROOT)\inc&quot;;..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/mfcsample.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -179,12 +179,12 @@
 			<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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../x64\vc8\libd/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../x64\vc8\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="17"
@@ -216,8 +216,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../win32\vc8\lib"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -242,24 +242,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/mfcsample.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -278,11 +278,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../win32\vc8\lib/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../../win32\vc8\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="1"
@@ -314,8 +314,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../x64\vc8\lib"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -340,24 +340,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/mfcsample.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -376,11 +376,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../x64\vc8\lib/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../../x64\vc8\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="17"
--- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../win32\vc9\libd"
-			IntermediateDirectory=".\win32\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,22 +47,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\objd/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\objd/mfcsample.pch"
-				AssemblerListingLocation=".\win32\objd/"
-				ObjectFile=".\win32\objd/"
-				ProgramDataBaseFileName=".\win32\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -82,12 +82,12 @@
 			<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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../win32\vc9\libd/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../win32\vc9\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../x64\vc9\libd"
-			IntermediateDirectory=".\x64\objd"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
+			IntermediateDirectory=".\$(OS_TYPE)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,22 +144,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\objd/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\objd/mfcsample.pch"
-				AssemblerListingLocation=".\x64\objd/"
-				ObjectFile=".\x64\objd/"
-				ProgramDataBaseFileName=".\x64\objd/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
+				ObjectFile=".\$(OS_TYPE)\objd/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -179,12 +179,12 @@
 			<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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../x64\vc9\libd/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../x64\vc9\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -215,8 +215,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../win32\vc9\lib"
-			IntermediateDirectory=".\win32\obj"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -241,24 +241,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\win32\obj/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\win32\obj/mfcsample.pch"
-				AssemblerListingLocation=".\win32\obj/"
-				ObjectFile=".\win32\obj/"
-				ProgramDataBaseFileName=".\win32\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -277,11 +277,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../win32\vc9\lib/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile="../../../../win32\vc9\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -312,8 +312,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../x64\vc9\lib"
-			IntermediateDirectory=".\x64\obj"
+			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
+			IntermediateDirectory=".\$(OS_TYPE)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -338,24 +338,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64\obj/mfcsample.tlb"
+				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\x64\obj/mfcsample.pch"
-				AssemblerListingLocation=".\x64\obj/"
-				ObjectFile=".\x64\obj/"
-				ProgramDataBaseFileName=".\x64\obj/"
+				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
+				ObjectFile=".\$(OS_TYPE)\obj/"
+				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -374,11 +374,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.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 TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../x64\vc9\lib/mfcsample.dll"
+				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile="../../../../x64\vc9\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
+				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
--- a/samples/mfc/standard/msvc.bat
+++ b/samples/mfc/standard/msvc.bat
@@ -1,4 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% All-%VCVER%.sln
-if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" All-%VCVER%.sln
--- a/samples/mfc/standard/readme.txt
+++ b/samples/mfc/standard/readme.txt
@@ -28,7 +28,7 @@
    |				   needed in every OCC sample. >    
    |
    |
-    |-- env.bat       		This file is called from msvc.bat.
+    |-- env.bat       		This file is called from Run_MSVC.bat.

 				   
 2. Launching Open CASCADE Technology samples:
@@ -36,22 +36,22 @@

 To run the Open CASCADE Technology samples:
    
-   > execute run.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug] [SampleName]
+   > execute Run.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug] [SampleName]

 To run the Animation sample:

-   > execute run.bat vc8 win32 Debug Animation
+   > execute Run.bat vc8 win32 Debug Animation

 3. Modifying and rebuilding samples:
 --------------------------------------------

 You can modify, compile and launch all sample projects in MS Visual C++ at once:
  
-    > execute msvc.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug]
+    > execute Run_MSVC.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug]

 To run all sample projects in MS Visual C++ at once: 
    
-    > execute msvc.bat vc8 win32 Debug
+    > execute Run_MSVC.bat vc8 win32 Debug


 Note: make sure your PATH environment variable contains a directory, 
--- a/samples/mfc/standard/run.bat
+++ b/samples/mfc/standard/run.bat
@@ -1,23 +0,0 @@
-echo %4
-if "%4" EQU "" (
-  echo Launch selected sample as follows: 
-  echo Run.bat [^vc8^|^vc9^|^vc10^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
-  echo Use option -d to run Debug mode
-  EXIT /B
-)
-
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-
-IF NOT EXIST %BIN_DIR%\%4.exe goto ERR_EXE
-
-start %BIN_DIR%\%4.exe
-
-GOTO END
-
-:ERR_EXE
-ECHO Executable %BIN_DIR%\%~n1.exe not found."
-ECHO Probably you didn't compile the application.
-EXIT /B
-
-:END
--- a/samples/qt/Common/Run_MSVC.bat
+++ b/samples/qt/Common/Run_MSVC.bat
@@ -0,0 +1,19 @@
+@ECHO OFF
+
+call env.bat
+
+IF NOT DEFINED QTDIR GOTO ERR_QTDIR
+
+REM *** To start build on MSVC6 ***
+REM msdev.exe Common.dsw
+
+REM *** To start build on MSVC7 ***
+start "%VS71COMNTOOLS%\..\IDE\devenv.exe" Common.sln
+
+GOTO END
+
+:ERR_QTDIR
+ECHO Environment variable "QTDIR" has not been defined. Abort.
+GOTO END
+
+:END
--- a/samples/qt/Common/env.bat
+++ b/samples/qt/Common/env.bat
@@ -0,0 +1,28 @@
+@ECHO OFF
+
+IF NOT DEFINED CASROOT GOTO ERR_CASROOT
+
+IF NOT EXIST "%CASROOT%\win32\bin\TKernel.dll" GOTO ERR_CASCADE
+
+SET CASLIBS=%CASROOT%\win32\bin
+
+SET ROOT=%CASROOT%\..
+
+SET RES_DIR=res
+SET BIN_DIR=win32\bin
+
+SET CSF_ResourcesDefaults=%RES_DIR%
+
+SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
+
+GOTO END
+
+:ERR_CASROOT
+ECHO Environment variable "CASROOT" has not been defined. Abort.
+EXIT
+
+:ERR_CASCADE
+ECHO Environment variable "CASROOT" defined incorrectly. Abort.
+EXIT
+
+:END
--- a/samples/qt/Common/generation-vc-projects.bat
+++ b/samples/qt/Common/generation-vc-projects.bat
@@ -0,0 +1,21 @@
+@ECHO OFF
+
+call env.bat
+
+IF NOT DEFINED QTDIR GOTO ERR_QTDIR
+
+SET PATH=%QTDIR%\bin;%PATH%
+
+SET TMP_CASROOT=%CASROOT%
+SET CASROOT=
+
+qmake -tp vc -r IESample.pro
+
+SET CASROOT=%TMP_CASROOT%
+GOTO END
+
+:ERR_QTDIR
+ECHO Environment variable "QTDIR" has not been defined. Abort.
+GOTO END
+
+:END
--- a/samples/qt/IESample/IESample-vc10.sln
+++ b/samples/qt/IESample/IESample-vc10.sln
@@ -1,5 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
 EndProject
 Global
--- a/samples/qt/IESample/IESample-vc8.sln
+++ b/samples/qt/IESample/IESample-vc8.sln
@@ -1,5 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
 EndProject
 Global
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -6,6 +6,9 @@ TARGET = IESample
 HEADERS = src/*.h
 SOURCES = src/*.cxx

+INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(QTDIR)/include/QtCore \
+              $(QTDIR)/include/QtGui $(QTDIR)/include
+
 TS_FILES = ./src/Common-icon.ts \
           ./src/Common-string.ts \
           ./src/Interface-string.ts
@@ -13,13 +16,6 @@ TS_FILES = ./src/Common-icon.ts \
 DEFINES = CSFDB

 unix {
-	INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,":")
-    for(path, PATHS):INCLUDEPATH += $${path}
-    LIBLIST = $$(LD_LIBRARY_PATH)
-    LIBPATHS = $$split(LIBLIST,":")
-    for(lib, LIBPATHS):LIBS += -L$${lib}
-
    CONFIG(debug, debug|release) {
 	DESTDIR = ./Linux/bind
 	OBJECTS_DIR = ./Linux/objd
@@ -31,98 +27,110 @@ unix {
    }
    INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
    DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
-    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
-    LIBS += -lfreeimageplus
-    LIBS += -ltbb -ltbbmalloc
+    LIBS = -L$(CASROOT)/Linux/lib -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+    FREEIMAGE_DIR = $$(FREEIMAGEDIR)
+    exists($$FREEIMAGE_DIR) {
+	LIBS += -L$(FREEIMAGEDIR)/lib -lfreeimageplus
+    }
+    TBB_LIB = $$(TBBLIB)
+    exists($$TBB_LIB) {
+	LIBS += -L$(TBBLIB) -ltbb -ltbbmalloc
+    }
 }

 win32 {
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,";")
-    for(path, PATHS):INCLUDEPATH += $${path}
-
    CONFIG(debug, debug|release) {
 	DEFINES += _DEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
-		LIBS = -L$(CSF_OPT_LIB32D)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
+	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bind
 		OBJECTS_DIR = ./win32/vc7/objd
 		MOC_DIR = ./win32/vc7/srcd
+		LIBS = -L$(CASROOT)/win32/vc7/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bind
 		OBJECTS_DIR = ./win32/vc8/objd
 		MOC_DIR = ./win32/vc8/srcd
+		LIBS = -L$(CASROOT)/win32/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bind
 		OBJECTS_DIR = ./win32/vc9/objd
 		MOC_DIR = ./win32/vc9/srcd
+		LIBS = -L$(CASROOT)/win32/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bind
 		OBJECTS_DIR = ./win32/vc10/objd
 		MOC_DIR = ./win32/vc10/srcd
+		LIBS = -L$(CASROOT)/win32/vc10/libd
 	    }
 	} else {
-		LIBS = -L$(CSF_OPT_LIB64D)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
+	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bind
 		OBJECTS_DIR = ./win64/vc8/objd
 		MOC_DIR = ./win64/vc8/srcd
+		LIBS = -L$(CASROOT)/win64/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bind
 		OBJECTS_DIR = ./win64/vc9/objd
 		MOC_DIR = ./win64/vc9/srcd
+		LIBS = -L$(CASROOT)/win64/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bind
 		OBJECTS_DIR = ./win64/vc10/objd
 		MOC_DIR = ./win64/vc10/srcd
+		LIBS = -L$(CASROOT)/win64/vc10/libd
 	    }
 	}
    } else {
 	DEFINES += NDEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
-		LIBS = -L$(CSF_OPT_LIB32)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
+	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bin
 		OBJECTS_DIR = ./win32/vc7/obj
 		MOC_DIR = ./win32/vc7/src
+		LIBS = -L$(CASROOT)/win32/vc7/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bin
 		OBJECTS_DIR = ./win32/vc8/obj
 		MOC_DIR = ./win32/vc8/src
+		LIBS = -L$(CASROOT)/win32/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bin
 		OBJECTS_DIR = ./win32/vc9/obj
 		MOC_DIR = ./win32/vc9/src
+		LIBS = -L$(CASROOT)/win32/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bin
 		OBJECTS_DIR = ./win32/vc10/obj
 		MOC_DIR = ./win32/vc10/src
+		LIBS = -L$(CASROOT)/win32/vc10/lib
 	    }
 	} else {
-		LIBS = -L$(CSF_OPT_LIB64)
-		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
+	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bin
 		OBJECTS_DIR = ./win64/vc8/obj
 		MOC_DIR = ./win64/vc8/src
+		LIBS = -L$(CASROOT)/win64/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bin
 		OBJECTS_DIR = ./win64/vc9/obj
 		MOC_DIR = ./win64/vc9/src
+		LIBS = -L$(CASROOT)/win64/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bin
 		OBJECTS_DIR = ./win64/vc10/obj
 		MOC_DIR = ./win64/vc10/src
+		LIBS = -L$(CASROOT)/win64/vc10/lib
 	    }
 	}
    }
@@ -134,9 +142,10 @@ LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
+	-L$(QTDIR)/lib -lQtCore -lQtGui

-lrelease.name = LRELEASE ${QMAKE_FILE_IN}
-lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
 lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.input = TS_FILES
 lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
--- a/samples/qt/IESample/Run.bat
+++ b/samples/qt/IESample/Run.bat
@@ -0,0 +1,31 @@
+@echo off
+
+call "%~dp0env.bat"
+
+if not exist win32\vc8\obj goto QTSET 
+
+if not exist "%QTDIR%" goto QTSET
+
+goto QT
+
+:QTSET
+
+set QTDIR=%ROOT%\3rdparty\win32\qt
+set PATH=%QTDIR%;%PATH%
+
+:QT
+
+if not exist "%BIN_DIR%\IESample.exe" goto ERR_EXE
+
+echo Starting IESample .....
+start /D "%BIN_DIR%" IESample.exe
+
+goto END
+
+:ERR_EXE
+echo Executable %BIN_DIR%\IESample.exe not found."
+echo Probably you didn't compile the application.
+pause
+goto END
+
+:END
--- a/samples/qt/IESample/Run_MSVC.bat
+++ b/samples/qt/IESample/Run_MSVC.bat
@@ -0,0 +1,24 @@
+@echo off
+rem Launch MS VC with environment prepared for building OCCT qt tutorial
+
+rem Set build environment 
+
+call %~dp0env.bat
+
+call %~dp0..\..\..\ros\env_build.bat vc8 win32
+
+rem Define path to project file
+set PRJFILE=%~dp0IESample-vc8.sln
+
+rem Launch Visual Studio - either professional (devenv) or Express, as available
+if exist "%DevEnvDir%\devenv.exe"  (
+    start devenv.exe "%PRJFILE%" /useenv
+) else if exist "%DevEnvDir%\VCExpress.exe"  (
+    start VCExpress.exe "%PRJFILE%" /useenv
+) else (
+    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
+    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+)
+
+)
+
--- a/samples/qt/IESample/custom.sh
+++ b/samples/qt/IESample/custom.sh
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake
-
-export CASROOT=""
-
-export QTDIR=""
-
-if test "${CASROOT}" == ""; then
-   echo "Environment variable \"CASROOT\" not defined."
-   exit 1
-fi
-
-if test "${QTDIR}" == ""; then
-   echo "Environment variable \"QTDIR\" not defined."
-   exit 1
-fi
-
-export PATH=${QTDIR}/bin:${PATH}
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,3 +1,32 @@
-SET RES_DIR=%~dp0res
+@ECHO OFF
+
+call "%~dp0..\..\..\ros\env.bat"
+
+IF NOT DEFINED CASROOT GOTO ERR_CASROOT
+
+IF NOT EXIST "%CASROOT%\win32\vc8\bin\TKernel.dll" GOTO ERR_CASCADE
+
+SET CASLIBS=%CASROOT%\win32\vc8\bin
+
+SET ROOT=%CASROOT%\..
+
+set RES_DIR=%~dp0res
+set BIN_DIR=%~dp0win32\vc8\bin
 SET CSF_ResourcesDefaults=%RES_DIR%
 SET CSF_IEResourcesDefaults=%RES_DIR%
+
+SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
+
+GOTO END
+
+:ERR_CASROOT
+ECHO Environment variable "CASROOT" has not been defined. Abort.
+pause
+exit /B
+
+:ERR_CASCADE
+ECHO Environment variable "CASROOT" defined incorrectly. Abort.
+pause
+exit /B
+
+:END
--- a/samples/qt/IESample/env.sh
+++ b/samples/qt/IESample/env.sh
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi
-source $CASROOT/env.sh
-export CSF_OPT_INC="${CSF_OPT_INC}${CASROOT}/inc:"
--- a/samples/qt/IESample/generation-vc-projects.bat
+++ b/samples/qt/IESample/generation-vc-projects.bat
@@ -3,30 +3,17 @@ REM Variable QTDIR and PATH to qmake executable must be defined without fail

 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
-REM third argument specifies Debug or Release mode

-call .\..\..\..\env.bat %1 %2 %3
+call "%~dp0..\..\..\ros\env_build.bat" %1 %2

-if not "%1" == "" (
-    if /I "%1" == "vc8" (
-        set VCVER=vc8
-        set "VCVARS=%VS80COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else if /I "%1" == "vc9" (
-        set VCVER=vc9
-        set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else if /I "%1" == "vc10" (
-        set VCVER=vc10
-        set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else (
-        echo Error: first argument ^(%1^) should specify supported version of Visual C++,
-        echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), or vc10 ^(VS 2010^)
-        exit
-    )
-)
+IF NOT DEFINED QTDIR GOTO ERR_QTDIR

-if ["%ARCH%"] == ["32"] set VCARCH=x86
-if ["%ARCH%"] == ["64"] set VCARCH=amd64
+SET PATH=%QTDIR%\bin;%PATH%

-call "%VCVARS%" %VCARCH%
+qmake -tp vc -r Tutorial.pro

-qmake -tp vc -r IESample.pro
+GOTO END
+:ERR_QTDIR
+ECHO Environment variable "QTDIR" has not been defined. Abort.
+
+:END
--- a/samples/qt/IESample/make.sh
+++ b/samples/qt/IESample/make.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
-cd $aSamplePath
-qmake IESample.pro
-make
--- a/samples/qt/IESample/msvc.bat
+++ b/samples/qt/IESample/msvc.bat
@@ -1,4 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% IESample-%VCVER%.sln
-if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" IESample-%VCVER%.sln
--- a/samples/qt/IESample/run.bat
+++ b/samples/qt/IESample/run.bat
@@ -1,23 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-
-IF not "%CASDEB%" EQU "" (
-SET BIN_DIR=win%ARCH%\%VCVER%\bind
-) ELSE (
-SET BIN_DIR=win%ARCH%\%VCVER%\bin
-)
-
-if not exist "%BIN_DIR%\IESample.exe" goto ERR_EXE
-
-echo Starting IESample .....
-start /D "%BIN_DIR%" IESample.exe
-
-goto END
-
-:ERR_EXE
-echo Executable %BIN_DIR%\IESample.exe not found."
-echo Probably you didn't compile the application.
-pause
-goto END
-
-:END
--- a/samples/qt/IESample/run.sh
+++ b/samples/qt/IESample/run.sh
@@ -1,22 +1,60 @@
 #!/bin/sh

-export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
-cd $aSamplePath
-
 host=`uname -s`
+
+PROG_DIR=`dirname $0`
+ROOT_DIR=`(cd $PROG_DIR; pwd)`
+
+if test ! -d "$host/obj"; then
+    QTDIR="$CASROOT/../3rdparty/$host/qt"
+    QT_LD_PATH="$CASROOT/../3rdparty/$host/qt"
+    CASCADE_LD_PATH="$CASROOT/$host/lib"
+    LD_LIBRARY_PATH="${CASCADE_LD_PATH}:${QT_LD_PATH}:${LD_LIBRARY_PATH}"
+fi
 STATION=$host

-RES_DIR="${aSamplePath}/res"
-BIN_DIR="${aSamplePath}/${STATION}/bin"
+if test "${CASROOT+set}" != "set"; then
+   echo "Environment variable \"CASROOT\" not defined."
+   CASROOT="$CASCADE_ROOT"
+   if test -n "$CASROOT"; then
+      echo "Try to use CASROOT=$CASROOT"
+   else
+      exit 1
+   fi
+fi
+
+if test ! -d "$CASROOT"; then
+   echo "CasCade root directory \"$CASROOT\" not found."
+   exit 1
+fi
+
+if test "${QTDIR+set}" != "set"; then
+   echo "Environment variable \"QTDIR\" not defined."
+   exit 1
+fi
+
+occ_opengl_lib=libTKOpenGl.so
+
+RES_DIR="${ROOT_DIR}/res"
+BIN_DIR="${ROOT_DIR}/${STATION}/bin"
+
+CSF_GraphicShr="${CASROOT}/${STATION}/lib/${occ_opengl_lib}"
+CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
+CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
+CSF_MDTVFontDirectory="${CASROOT}/src/FontMFT"
+CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"

 CSF_ResourcesDefaults="${RES_DIR}"
 CSF_IEResourcesDefaults="${RES_DIR}"

+echo $LD_LIBRARY_PATH
+
 PATH="${BIN_DIR}:${PATH}"

+export CSF_GraphicShr CSF_UnitsLexicon CSF_UnitsDefinition
+export CSF_MDTVFontDirectory CSF_MDTVTexturesDirectory
 export CSF_IEResourcesDefaults CSF_ResourcesDefaults
-export PATH
+export PATH LD_LIBRARY_PATH

 if test ! -r "${BIN_DIR}/IESample"; then
   echo "Executable \"${BIN_DIR}/IESample\" not found."
@@ -25,3 +63,4 @@ if test ! -r "${BIN_DIR}/IESample"; then
 fi

 ${BIN_DIR}/IESample
+
--- a/samples/qt/Interface/Run_MSVC.bat
+++ b/samples/qt/Interface/Run_MSVC.bat
@@ -0,0 +1,19 @@
+@ECHO OFF
+
+call env.bat
+
+IF NOT DEFINED QTDIR GOTO ERR_QTDIR
+
+REM *** To start build on MSVC6 ***
+REM msdev.exe Interface.dsw
+
+REM *** To start build on MSVC7 ***
+start "%VS71COMNTOOLS%\..\IDE\devenv.exe" Interface.sln
+
+GOTO END
+
+:ERR_QTDIR
+ECHO Environment variable "QTDIR" not defined. Abort.
+GOTO END
+
+:END
--- a/samples/qt/Interface/env.bat
+++ b/samples/qt/Interface/env.bat
@@ -0,0 +1,31 @@
+@ECHO OFF
+
+IF NOT DEFINED CASROOT GOTO ERR_CASROOT
+
+IF NOT EXIST "%CASROOT%\win32\bin\TKernel.dll" GOTO ERR_CASCADE
+
+SET CASLIBS=%CASROOT%\win32\bin
+
+SET ROOT=%CASROOT%\..
+
+SET RES_DIR=res
+SET BIN_DIR=win32\bin
+
+SET CSF_ResourcesDefaults=..\Common\res
+SET CSF_IEResourcesDefaults=%RES_DIR%
+
+SET COMMONROOT=..\Common
+
+SET PATH=%COMMONROOT%\win32\bin;%CASLIBS%;%QTDIR%\bin;%PATH%
+
+GOTO END
+
+:ERR_CASROOT
+ECHO Environment variable "CASROOT" has not been defined. Abort.
+EXIT
+
+:ERR_CASCADE
+ECHO Environment variable "CASROOT" defined incorrectly. Abort.
+EXIT
+
+:END
--- a/samples/qt/Tutorial/Run.bat
+++ b/samples/qt/Tutorial/Run.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+call "%~dp0env.bat"
+
+IF NOT EXIST win32\vc8\obj goto QTSET 
+
+IF NOT EXIST "%QTDIR%" goto QTSET
+
+goto QT
+
+:QTSET
+
+SET QTDIR=%ROOT%\3rdparty\win32\qt
+SET PATH=%QTDIR%;%PATH%
+
+:QT
+
+if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE
+
+echo %QTDIR%
+echo Starting IESample .....
+start /D "%BIN_DIR%" Tutorial.exe
+
+
+
+GOTO END
+
+:ERR_EXE
+ECHO Executable %BIN_DIR%\Tutorial.exe not found."
+ECHO Probably you didn't compile the application.
+pause
+GOTO END
+
+:END
+
--- a/samples/qt/Tutorial/Run_MSVC.bat
+++ b/samples/qt/Tutorial/Run_MSVC.bat
@@ -0,0 +1,23 @@
+@echo off
+rem Launch MS VC with environment prepared for building OCCT qt tutorial
+
+rem Set build environment 
+
+call %~dp0env.bat
+
+call %~dp0..\..\..\ros\env_build.bat vc8 win32
+
+rem Define path to project file
+set PRJFILE=%~dp0Tutorial-vc8.sln
+
+rem Launch Visual Studio - either professional (devenv) or Express, as available
+if exist "%DevEnvDir%\devenv.exe"  (
+    start devenv.exe "%PRJFILE%" /useenv
+) else if exist "%DevEnvDir%\VCExpress.exe"  (
+    start VCExpress.exe "%PRJFILE%" /useenv
+) else (
+    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
+    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+)
+
+
--- a/samples/qt/Tutorial/Tutorial-vc10.sln
+++ b/samples/qt/Tutorial/Tutorial-vc10.sln
@@ -1,5 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
 EndProject
 Global
--- a/samples/qt/Tutorial/Tutorial-vc8.sln
+++ b/samples/qt/Tutorial/Tutorial-vc8.sln
@@ -1,5 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
 EndProject
 Global
--- a/samples/qt/Tutorial/Tutorial-vc9.sln
+++ b/samples/qt/Tutorial/Tutorial-vc9.sln
@@ -1,5 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
 EndProject
 Global
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -6,6 +6,8 @@ TARGET = Tutorial
 HEADERS = src/*.h
 SOURCES = src/*.cxx

+INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(CASROOT)/src/WOKTclLib $(QTDIR)/include/QtCore \
+              $(QTDIR)/include/QtGui $(QTDIR)/include

 TS_FILES = ./src/Common-icon.ts \
           ./src/Common-string.ts \
@@ -15,13 +17,6 @@ TS_FILES = ./src/Common-icon.ts \
 DEFINES = CSFDB

 unix {
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,":")
-    for(path, PATHS):INCLUDEPATH += $${path}
-    LIBLIST = $$(LD_LIBRARY_PATH)
-    LIBPATHS = $$split(LIBLIST,":")
-    for(lib, LIBPATHS):LIBS += -L$${lib}
-    
    CONFIG(debug, debug|release) {
 	DESTDIR = ./Linux/bind
 	OBJECTS_DIR = ./Linux/objd
@@ -33,98 +28,110 @@ unix {
    }
    INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
    DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H
-    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
-	LIBS += -lfreeimageplus
-	LIBS += -ltbb -ltbbmalloc
+    LIBS = -L$(CASROOT)/Linux/lib -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+    FREEIMAGE_DIR = $$(FREEIMAGEDIR)
+    exists($$FREEIMAGE_DIR) {
+	LIBS += -L$(FREEIMAGEDIR)/lib -lfreeimageplus
+    }
+    TBB_LIB = $$(TBBLIB)
+    exists($$TBB_LIB) {
+	LIBS += -L$(TBBLIB) -ltbb -ltbbmalloc
+    }
 }

 win32 {
-    INCLUDES = $$(CSF_OPT_INC)
-    PATHS = $$split(INCLUDES,";")
-    for(path, PATHS):INCLUDEPATH += $${path}
-
    CONFIG(debug, debug|release) {
 	DEFINES += _DEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
-		LIBS = -L$(CSF_OPT_LIB32D)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bind
 		OBJECTS_DIR = ./win32/vc7/objd
 		MOC_DIR = ./win32/vc7/srcd
+		LIBS = -L$(CASROOT)/win32/vc7/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bind
 		OBJECTS_DIR = ./win32/vc8/objd
 		MOC_DIR = ./win32/vc8/srcd
+		LIBS = -L$(CASROOT)/win32/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bind
 		OBJECTS_DIR = ./win32/vc9/objd
 		MOC_DIR = ./win32/vc9/srcd
+		LIBS = -L$(CASROOT)/win32/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bind
 		OBJECTS_DIR = ./win32/vc10/objd
 		MOC_DIR = ./win32/vc10/srcd
+		LIBS = -L$(CASROOT)/win32/vc10/libd
 	    }
 	} else {
-		LIBS = -L$(CSF_OPT_LIB64D)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bind
 		OBJECTS_DIR = ./win64/vc8/objd
 		MOC_DIR = ./win64/vc8/srcd
+		LIBS = -L$(CASROOT)/win64/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bind
 		OBJECTS_DIR = ./win64/vc9/objd
 		MOC_DIR = ./win64/vc9/srcd
+		LIBS = -L$(CASROOT)/win64/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bind
 		OBJECTS_DIR = ./win64/vc10/objd
 		MOC_DIR = ./win64/vc10/srcd
+		LIBS = -L$(CASROOT)/win64/vc10/libd
 	    }
 	}
    } else {
 	DEFINES += NDEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
-		LIBS = -L$(CSF_OPT_LIB32)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bin
 		OBJECTS_DIR = ./win32/vc7/obj
 		MOC_DIR = ./win32/vc7/src
+		LIBS = -L$(CASROOT)/win32/vc7/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bin
 		OBJECTS_DIR = ./win32/vc8/obj
 		MOC_DIR = ./win32/vc8/src
+		LIBS = -L$(CASROOT)/win32/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bin
 		OBJECTS_DIR = ./win32/vc9/obj
 		MOC_DIR = ./win32/vc9/src
+		LIBS = -L$(CASROOT)/win32/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bin
 		OBJECTS_DIR = ./win32/vc10/obj
 		MOC_DIR = ./win32/vc10/src
+		LIBS = -L$(CASROOT)/win32/vc10/lib
 	    }
 	} else {
-		LIBS = -L$(CSF_OPT_LIB64)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bin
 		OBJECTS_DIR = ./win64/vc8/obj
 		MOC_DIR = ./win64/vc8/src
+		LIBS = -L$(CASROOT)/win64/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bin
 		OBJECTS_DIR = ./win64/vc9/obj
 		MOC_DIR = ./win64/vc9/src
+		LIBS = -L$(CASROOT)/win64/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bin
 		OBJECTS_DIR = ./win64/vc10/obj
 		MOC_DIR = ./win64/vc10/src
+		LIBS = -L$(CASROOT)/win64/vc10/lib
 	    }
 	}
    }
@@ -136,11 +143,12 @@ LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
+	-L$(QTDIR)/lib -lQtCore -lQtGui

-lrelease.name = LRELEASE ${QMAKE_FILE_IN}
-lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
+lrelease.name = LRELASE ${QMAKE_FILE_IN}
+lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
 lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.input = TS_FILES
 lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
+QMAKE_EXTRA_COMPILERS += lrelease
--- a/samples/qt/Tutorial/custom.sh
+++ b/samples/qt/Tutorial/custom.sh
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake
-
-export CASROOT=""
-
-export QTDIR=""
-
-if test "${CASROOT}" == ""; then
-   echo "Environment variable \"CASROOT\" not defined."
-   exit 1
-fi
-
-if test "${QTDIR}" == ""; then
-   echo "Environment variable \"QTDIR\" not defined."
-   exit 1
-fi
-
-export PATH=${QTDIR}/bin:${PATH}
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,4 +1,33 @@
-SET RES_DIR=%~dp0res
-SET CSF_ResourcesDefaults=%RES_DIR%
-SET CSF_TutorialResourcesDefaults=%RES_DIR%
+@ECHO OFF

+call "%~dp0..\..\..\ros\env.bat"
+
+IF NOT DEFINED CASROOT GOTO ERR_CASROOT
+
+IF NOT EXIST "%CASROOT%\win32\vc8\bin\TKernel.dll" GOTO ERR_CASCADE
+
+SET CASLIBS=%CASROOT%\win32\vc8\bin
+
+SET ROOT=%CASROOT%\..
+
+set RES_DIR=%~dp0res
+set BIN_DIR=%~dp0win32\vc8\bin
+
+SET CSF_ResourcesDefaults=%RES_DIR%
+SET CSF_TuturialResourcesDefaults=%RES_DIR%
+
+SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
+
+GOTO END
+
+:ERR_CASROOT
+ECHO Environment variable "CASROOT" has not been defined. Abort.
+pause
+exit /B
+
+:ERR_CASCADE
+ECHO Environment variable "CASROOT" defined incorrectly. Abort.
+pause
+exit /B
+
+:END
--- a/samples/qt/Tutorial/env.sh
+++ b/samples/qt/Tutorial/env.sh
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi
-source $CASROOT/env.sh
-export CSF_OPT_INC="${CSF_OPT_INC}${CASROOT}/inc:"
--- a/samples/qt/Tutorial/generation-vc-projects.bat
+++ b/samples/qt/Tutorial/generation-vc-projects.bat
@@ -3,30 +3,17 @@ REM Variable QTDIR and PATH to qmake executable must be defined without fail

 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
-REM third argument specifies Debug or Release mode

-call .\..\..\..\env.bat %1 %2 %3
+call "%~dp0..\..\..\ros\env_build.bat" %1 %2

-if not "%1" == "" (
-    if /I "%1" == "vc8" (
-        set VCVER=vc8
-        set "VCVARS=%VS80COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else if /I "%1" == "vc9" (
-        set VCVER=vc9
-        set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else if /I "%1" == "vc10" (
-        set VCVER=vc10
-        set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
-    ) else (
-        echo Error: first argument ^(%1^) should specify supported version of Visual C++,
-        echo one of: vc8 ^(VS 2005 SP1^), vc9 ^(VS 2008 SP1^), or vc10 ^(VS 2010^)
-        exit
-    )
-)
+IF NOT DEFINED QTDIR GOTO ERR_QTDIR

-if ["%ARCH%"] == ["32"] set VCARCH=x86
-if ["%ARCH%"] == ["64"] set VCARCH=amd64
-
-call "%VCVARS%" %VCARCH%
+SET PATH=%QTDIR%\bin;%PATH%

 qmake -tp vc -r Tutorial.pro
+
+GOTO END
+:ERR_QTDIR
+ECHO Environment variable "QTDIR" has not been defined. Abort.
+
+:END
--- a/samples/qt/Tutorial/make.sh
+++ b/samples/qt/Tutorial/make.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
-cd $aSamplePath
-qmake Tutorial.pro
-make
--- a/samples/qt/Tutorial/msvc.bat
+++ b/samples/qt/Tutorial/msvc.bat
@@ -1,4 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% Tutorial-%VCVER%.sln
-if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" Tutorial-%VCVER%.sln
--- a/samples/qt/Tutorial/run.bat
+++ b/samples/qt/Tutorial/run.bat
@@ -1,23 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-
-IF not "%CASDEB%" EQU "" (
-SET BIN_DIR=win%ARCH%\%VCVER%\bind
-) ELSE (
-SET BIN_DIR=win%ARCH%\%VCVER%\bin
-)
-
-if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE
-
-echo Starting Tutorial .....
-start /D "%BIN_DIR%" Tutorial.exe
-
-goto END
-
-:ERR_EXE
-echo Executable %BIN_DIR%\Tutorial.exe not found."
-echo Probably you didn't compile the application.
-pause
-goto END
-
-:END
--- a/samples/qt/Tutorial/run.sh
+++ b/samples/qt/Tutorial/run.sh
@@ -1,22 +1,58 @@
 #!/bin/sh

-export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
-cd $aSamplePath
-
 host=`uname -s`
+
+PROG_DIR=`dirname $0`
+ROOT_DIR=`(cd $PROG_DIR; pwd)`
+
+if test ! -d "$host/obj"; then
+    QTDIR="$CASROOT/../3rdparty/$host/qt"
+    QT_LD_PATH="$CASROOT/../3rdparty/$host/qt"
+    CASCADE_LD_PATH="$CASROOT/$host/lib"
+    LD_LIBRARY_PATH="${CASCADE_LD_PATH}:${QT_LD_PATH}:${LD_LIBRARY_PATH}"
+fi
 STATION=$host

-RES_DIR="${aSamplePath}/res"
-BIN_DIR="${aSamplePath}/${STATION}/bin"
+if test "${CASROOT+set}" != "set"; then
+   echo "Environment variable \"CASROOT\" not defined."
+   CASROOT="$CASCADE_ROOT"
+   if test -n "$CASROOT"; then
+      echo "Try to use CASROOT=$CASROOT"
+   else
+      exit 1
+   fi
+fi
+
+if test ! -d "$CASROOT"; then
+   echo "CasCade root directory \"$CASROOT\" not found."
+   exit 1
+fi
+
+if test "${QTDIR+set}" != "set"; then
+   echo "Environment variable \"QTDIR\" not defined."
+   exit 1
+fi
+
+occ_opengl_lib=libTKOpenGl.so
+
+RES_DIR="${ROOT_DIR}/res"
+BIN_DIR="${ROOT_DIR}/${STATION}/bin"
+
+CSF_GraphicShr="${CASROOT}/${STATION}/lib/${occ_opengl_lib}"
+CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
+CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
+CSF_MDTVFontDirectory="${CASROOT}/src/FontMFT"
+CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"

 CSF_ResourcesDefaults="${RES_DIR}"
-CSF_TutorialResourcesDefaults="${RES_DIR}"
+CSF_TuturialResourcesDefaults="${RES_DIR}"

 PATH="${BIN_DIR}:${PATH}"

-export CSF_TutorialResourcesDefaults CSF_ResourcesDefaults
-export PATH
+export CSF_GraphicShr CSF_UnitsLexicon CSF_UnitsDefinition
+export CSF_MDTVFontDirectory CSF_MDTVTexturesDirectory
+export CSF_TuturialResourcesDefaults CSF_ResourcesDefaults
+export PATH LD_LIBRARY_PATH

 if test ! -r "${BIN_DIR}/Tutorial"; then
   echo "Executable \"${BIN_DIR}/Tutorial\" not found."
@@ -25,3 +61,4 @@ if test ! -r "${BIN_DIR}/Tutorial"; then
 fi

 ${BIN_DIR}/Tutorial
+
--- a/samples/qt/Tutorial/src/ApplicationTut.cxx
+++ b/samples/qt/Tutorial/src/ApplicationTut.cxx
@@ -58,7 +58,7 @@ void ApplicationTut::onMakeBottleAction()

 QString ApplicationTut::getTutResourceDir()
 {
-    static QString resDir( ::getenv( "CSF_TutorialResourcesDefaults" ) );
+    static QString resDir( ::getenv( "CSF_TuturialResourcesDefaults" ) );
    return resDir;
 }

--- a/samples/qt/Tutorial/src/MakeBottle.cxx
+++ b/samples/qt/Tutorial/src/MakeBottle.cxx
@@ -54,138 +54,164 @@


 TopoDS_Shape
-MakeBottle(const Standard_Real myWidth, const Standard_Real myHeight,
-           const Standard_Real myThickness)
+MakeBottle(const Standard_Real myWidth , const Standard_Real myHeight ,
+		   const Standard_Real myThickness)
 {
-  // Profile : Define Support Points
-  gp_Pnt aPnt1(-myWidth / 2., 0, 0);        
-  gp_Pnt aPnt2(-myWidth / 2., -myThickness / 4., 0);
-  gp_Pnt aPnt3(0, -myThickness / 2., 0);
-  gp_Pnt aPnt4(myWidth / 2., -myThickness / 4., 0);
-  gp_Pnt aPnt5(myWidth / 2., 0, 0);
+	//Profile : Define Support Points
+	gp_Pnt aPnt1(-myWidth / 2. , 0 , 0);
+  gp_Pnt aPnt2(-myWidth / 2. , -myThickness / 4. , 0);
+  gp_Pnt aPnt3(0 , -myThickness / 2. , 0);
+  gp_Pnt aPnt4(myWidth / 2. , -myThickness / 4. , 0);
+  gp_Pnt aPnt5(myWidth / 2. , 0 , 0);

-  // Profile : Define the Geometry
-  Handle(Geom_TrimmedCurve) anArcOfCircle = GC_MakeArcOfCircle(aPnt2,aPnt3,aPnt4);
-  Handle(Geom_TrimmedCurve) aSegment1 = GC_MakeSegment(aPnt1, aPnt2);
-  Handle(Geom_TrimmedCurve) aSegment2 = GC_MakeSegment(aPnt4, aPnt5);
+	//Profile : Define the Geometry
+	Handle(Geom_TrimmedCurve) aArcOfCircle = GC_MakeArcOfCircle(aPnt2,aPnt3 ,aPnt4);
+  Handle(Geom_TrimmedCurve) aSegment1	   = GC_MakeSegment(aPnt1 , aPnt2);
+  Handle(Geom_TrimmedCurve) aSegment2	   = GC_MakeSegment(aPnt4 , aPnt5);

-  // Profile : Define the Topology
-  TopoDS_Edge anEdge1 = BRepBuilderAPI_MakeEdge(aSegment1);
-  TopoDS_Edge anEdge2 = BRepBuilderAPI_MakeEdge(anArcOfCircle);
-  TopoDS_Edge anEdge3 = BRepBuilderAPI_MakeEdge(aSegment2);
-  TopoDS_Wire aWire  = BRepBuilderAPI_MakeWire(anEdge1, anEdge2, anEdge3);
+	//Profile : Define the Topology
+	TopoDS_Edge aEdge1 = BRepBuilderAPI_MakeEdge(aSegment1);
+	TopoDS_Edge aEdge2 = BRepBuilderAPI_MakeEdge(aArcOfCircle);
+  TopoDS_Edge aEdge3 = BRepBuilderAPI_MakeEdge(aSegment2);
+	TopoDS_Wire aWire  = BRepBuilderAPI_MakeWire(aEdge1 , aEdge2 , aEdge3);

-  // Complete Profile
-  gp_Ax1 xAxis = gp::OX();
-  gp_Trsf aTrsf;
+	//Complete Profile
+	gp_Ax1 xAxis = gp::OX();
+	gp_Trsf aTrsf;

  aTrsf.SetMirror(xAxis);
-  BRepBuilderAPI_Transform aBRepTrsf(aWire, aTrsf);
-  TopoDS_Shape aMirroredShape = aBRepTrsf.Shape();
-  TopoDS_Wire aMirroredWire = TopoDS::Wire(aMirroredShape);

-  BRepBuilderAPI_MakeWire mkWire;
+	BRepBuilderAPI_Transform aBRepTrsf(aWire , aTrsf);
+	TopoDS_Shape aMirroredShape = aBRepTrsf.Shape();
+	TopoDS_Wire aMirroredWire = TopoDS::Wire(aMirroredShape);
+
+	BRepBuilderAPI_MakeWire mkWire;
+
  mkWire.Add(aWire);
  mkWire.Add(aMirroredWire);
+
  TopoDS_Wire myWireProfile = mkWire.Wire();

-  // Body : Prism the Profile
-  TopoDS_Face myFaceProfile = BRepBuilderAPI_MakeFace(myWireProfile);
-  gp_Vec aPrismVec(0, 0, myHeight);
-  TopoDS_Shape myBody = BRepPrimAPI_MakePrism(myFaceProfile, aPrismVec);
+	//Body : Prism the Profile
+	TopoDS_Face myFaceProfile = BRepBuilderAPI_MakeFace(myWireProfile);
+	gp_Vec		aPrismVec(0 , 0 , myHeight);

-  // Body : Apply Fillets
-  BRepFilletAPI_MakeFillet mkFillet(myBody);
-  TopExp_Explorer anEdgeExplorer(myBody, TopAbs_EDGE);
-  while(anEdgeExplorer.More()){
-    TopoDS_Edge anEdge = TopoDS::Edge(anEdgeExplorer.Current());
-    //Add edge to fillet algorithm
-    mkFillet.Add(myThickness / 12., anEdge);
-    anEdgeExplorer.Next();
-  }
+	TopoDS_Shape myBody = BRepPrimAPI_MakePrism(myFaceProfile , aPrismVec);

-  myBody = mkFillet.Shape();
+	//Body : Apply Fillets
+	BRepFilletAPI_MakeFillet mkFillet(myBody);
+	TopExp_Explorer			 aEdgeExplorer(myBody , TopAbs_EDGE);

-  // Body : Add the Neck	
-  gp_Pnt neckLocation(0, 0, myHeight);
-  gp_Dir neckAxis = gp::DZ();
-  gp_Ax2 neckAx2(neckLocation, neckAxis);
+	while(aEdgeExplorer.More()){
+		
+		TopoDS_Edge aEdge = TopoDS::Edge(aEdgeExplorer.Current());

-  Standard_Real myNeckRadius = myThickness / 4.;
-  Standard_Real myNeckHeight = myHeight / 10.;
+        //Add edge to fillet algorithm
+		mkFillet.Add(myThickness / 12. , aEdge);

-  BRepPrimAPI_MakeCylinder MKCylinder(neckAx2, myNeckRadius, myNeckHeight);
-  TopoDS_Shape myNeck = MKCylinder.Shape();
+    aEdgeExplorer.Next();
+	}

-  myBody = BRepAlgoAPI_Fuse(myBody, myNeck);
+	myBody = mkFillet.Shape();

-  // Body : Create a Hollowed Solid
-  TopoDS_Face   faceToRemove;
-  Standard_Real zMax = -1;
+	//Body : Add the Neck	
+	gp_Pnt neckLocation(0 , 0 , myHeight);
+	gp_Dir neckNormal = gp::DZ();
+  gp_Ax2 neckAx2(neckLocation , neckNormal);

-  for(TopExp_Explorer aFaceExplorer(myBody, TopAbs_FACE); aFaceExplorer.More(); aFaceExplorer.Next()){
-    TopoDS_Face aFace = TopoDS::Face(aFaceExplorer.Current());
-    // Check if <aFace> is the top face of the bottle<6C>s neck 
-    Handle(Geom_Surface) aSurface = BRep_Tool::Surface(aFace);
-    if(aSurface->DynamicType() == STANDARD_TYPE(Geom_Plane)){
-      Handle(Geom_Plane) aPlane = Handle(Geom_Plane)::DownCast(aSurface);
-      gp_Pnt aPnt = aPlane->Location();
-      Standard_Real aZ   = aPnt.Z();
-      if(aZ > zMax){
-        zMax = aZ;
+	Standard_Real myNeckRadius = myThickness / 4.;
+	Standard_Real myNeckHeight = myHeight / 10;
+
+	BRepPrimAPI_MakeCylinder MKCylinder(neckAx2 , myNeckRadius , myNeckHeight);
+	TopoDS_Shape myNeck = MKCylinder.Shape();
+
+	myBody = BRepAlgoAPI_Fuse(myBody , myNeck);
+
+	//Body : Create a Hollowed Solid
+	TopoDS_Face   faceToRemove;
+	Standard_Real zMax = -1;
+
+	for(TopExp_Explorer aFaceExplorer(myBody , TopAbs_FACE) ; aFaceExplorer.More() ; aFaceExplorer.Next()){
+		
+		TopoDS_Face aFace = TopoDS::Face(aFaceExplorer.Current());
+
+        //Check if <aFace> is the top face of the bottle's neck
+		Handle(Geom_Surface) aSurface = BRep_Tool::Surface(aFace);
+
+		if(aSurface->DynamicType() == STANDARD_TYPE(Geom_Plane)){
+
+			Handle(Geom_Plane) aPlane = Handle(Geom_Plane)::DownCast(aSurface);
+
+			gp_Pnt		  aPnt = aPlane->Location();
+			Standard_Real aZ   = aPnt.Z();
+			
+			if(aZ > zMax){
+				
+				zMax		 = aZ;
        faceToRemove = aFace;
-      }
-    }
-  }
+			}
+		}
+	}

-  TopTools_ListOfShape facesToRemove;
-  facesToRemove.Append(faceToRemove);
-  myBody = BRepOffsetAPI_MakeThickSolid(myBody, facesToRemove, -myThickness / 50, 1.e-3);
-  // Threading : Create Surfaces
-  Handle(Geom_CylindricalSurface) aCyl1 = new Geom_CylindricalSurface(neckAx2, myNeckRadius * 0.99);
-  Handle(Geom_CylindricalSurface) aCyl2 = new Geom_CylindricalSurface(neckAx2, myNeckRadius * 1.05);
+	TopTools_ListOfShape facesToRemove;
+	
+	facesToRemove.Append(faceToRemove);

-  // Threading : Define 2D Curves
-  gp_Pnt2d aPnt(2. * M_PI, myNeckHeight / 2.);
-  gp_Dir2d aDir(2. * M_PI, myNeckHeight / 4.);
-  gp_Ax2d anAx2d(aPnt, aDir);
+	myBody = BRepOffsetAPI_MakeThickSolid(myBody , facesToRemove , -myThickness / 50 , 1.e-3);

-  Standard_Real aMajor = 2. * M_PI;
+
+	//return myBody;
+	//Threading : Create Surfaces
+	Handle(Geom_CylindricalSurface) aCyl1 = new Geom_CylindricalSurface(neckAx2 , myNeckRadius * 0.99);
+	Handle(Geom_CylindricalSurface) aCyl2 = new Geom_CylindricalSurface(neckAx2 , myNeckRadius * 1.05);
+
+	//Threading : Define 2D Curves
+	gp_Pnt2d aPnt(2. * PI , myNeckHeight / 2.);
+  gp_Dir2d aDir(2. * PI , myNeckHeight / 4.);
+  gp_Ax2d aAx2d(aPnt , aDir);
+
+	Standard_Real aMajor = 2. * PI;
  Standard_Real aMinor = myNeckHeight / 10;

-  Handle(Geom2d_Ellipse) anEllipse1 = new Geom2d_Ellipse(anAx2d, aMajor, aMinor);
-  Handle(Geom2d_Ellipse) anEllipse2 = new Geom2d_Ellipse(anAx2d, aMajor, aMinor / 4);
-  Handle(Geom2d_TrimmedCurve) anArc1 = new Geom2d_TrimmedCurve(anEllipse1, 0, M_PI);
-  Handle(Geom2d_TrimmedCurve) anArc2 = new Geom2d_TrimmedCurve(anEllipse2, 0, M_PI);
-  gp_Pnt2d anEllipsePnt1 = anEllipse1->Value(0);
-  gp_Pnt2d anEllipsePnt2 = anEllipse1->Value(M_PI);
+  Handle(Geom2d_Ellipse) anEllipse1 = new Geom2d_Ellipse(aAx2d , aMajor , aMinor);
+  Handle(Geom2d_Ellipse) anEllipse2 = new Geom2d_Ellipse(aAx2d , aMajor , aMinor / 4);

-  Handle(Geom2d_TrimmedCurve) aSegment = GCE2d_MakeSegment(anEllipsePnt1, anEllipsePnt2);
-  // Threading : Build Edges and Wires
-  TopoDS_Edge anEdge1OnSurf1 = BRepBuilderAPI_MakeEdge(anArc1, aCyl1);
-  TopoDS_Edge anEdge2OnSurf1 = BRepBuilderAPI_MakeEdge(aSegment, aCyl1);
-  TopoDS_Edge anEdge1OnSurf2 = BRepBuilderAPI_MakeEdge(anArc2, aCyl2);
-  TopoDS_Edge anEdge2OnSurf2 = BRepBuilderAPI_MakeEdge(aSegment, aCyl2);
-  TopoDS_Wire threadingWire1 = BRepBuilderAPI_MakeWire(anEdge1OnSurf1, anEdge2OnSurf1);
-  TopoDS_Wire threadingWire2 = BRepBuilderAPI_MakeWire(anEdge1OnSurf2, anEdge2OnSurf2);
-  BRepLib::BuildCurves3d(threadingWire1);
-  BRepLib::BuildCurves3d(threadingWire2);
+	Handle(Geom2d_TrimmedCurve) aArc1 = new Geom2d_TrimmedCurve(anEllipse1 , 0 , PI);
+	Handle(Geom2d_TrimmedCurve) aArc2 = new Geom2d_TrimmedCurve(anEllipse2 , 0 , PI);

-  // Create Threading 
-  BRepOffsetAPI_ThruSections aTool(Standard_True);
-  aTool.AddWire(threadingWire1);
-  aTool.AddWire(threadingWire2);
-  aTool.CheckCompatibility(Standard_False);
+	gp_Pnt2d anEllipsePnt1 = anEllipse1->Value(0);
+	gp_Pnt2d anEllipsePnt2 = anEllipse1->Value(PI);
+	
+	Handle(Geom2d_TrimmedCurve) aSegment = GCE2d_MakeSegment(anEllipsePnt1 , anEllipsePnt2);

-  TopoDS_Shape myThreading = aTool.Shape();
+	//Threading : Build Edges and Wires
+	TopoDS_Edge aEdge1OnSurf1 = BRepBuilderAPI_MakeEdge(aArc1 , aCyl1);
+	TopoDS_Edge aEdge2OnSurf1 = BRepBuilderAPI_MakeEdge(aSegment , aCyl1);
+	TopoDS_Edge aEdge1OnSurf2 = BRepBuilderAPI_MakeEdge(aArc2 , aCyl2);
+	TopoDS_Edge aEdge2OnSurf2 = BRepBuilderAPI_MakeEdge(aSegment , aCyl2);

-  // Building the Resulting Compound 
-  TopoDS_Compound aRes;
-  BRep_Builder aBuilder;
-  aBuilder.MakeCompound (aRes);
-  aBuilder.Add (aRes, myBody);
-  aBuilder.Add (aRes, myThreading);
+	TopoDS_Wire threadingWire1 = BRepBuilderAPI_MakeWire(aEdge1OnSurf1 , aEdge2OnSurf1);
+	TopoDS_Wire threadingWire2 = BRepBuilderAPI_MakeWire(aEdge1OnSurf2 , aEdge2OnSurf2);

-  return aRes;
+	BRepLib::BuildCurves3d(threadingWire1);
+	BRepLib::BuildCurves3d(threadingWire2);
+
+	//Create Threading
+	BRepOffsetAPI_ThruSections aTool(Standard_True);
+	
+	aTool.AddWire(threadingWire1);
+	aTool.AddWire(threadingWire2);
+	aTool.CheckCompatibility(Standard_False);
+
+	TopoDS_Shape myThreading = aTool.Shape();
+
+	//Building the resulting compound
+	TopoDS_Compound aRes;
+	BRep_Builder aBuilder;
+	aBuilder.MakeCompound (aRes);
+
+	aBuilder.Add (aRes, myBody);
+	aBuilder.Add (aRes, myThreading);
+
+	return aRes;
 }
-
--- a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
+++ b/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
--- a/samples/qt/voxeldemo/Run.bat
+++ b/samples/qt/voxeldemo/Run.bat
@@ -0,0 +1,6 @@
+@ECHO OFF
+
+call %~dp0env.bat
+
+@echo Starting VoxelDemo .....
+start .\%BIN_DIR%\VoxelDemo.exe
--- a/samples/qt/voxeldemo/Run_MSVC.bat
+++ b/samples/qt/voxeldemo/Run_MSVC.bat
@@ -0,0 +1,30 @@
+@echo off
+rem Launch MS VC with environment prepared for building OCCT qt Voxel demo
+
+rem Set build environment 
+
+call %~dp0..\..\..\ros\env_build.bat vc8 win32
+
+
+SET BIN_DIR=Release
+SET CSF_GraphicShr=OpenGl\Release\VoxelOpenGl.dll
+
+SET PATH=OpenGl\Release;%QTDIR%\bin;%QTDIR%;%PATH%
+
+SET CSF_TEX_FONT=2
+SET MMGT_REENTRANT=1
+
+
+rem Define path to project file
+set PRJFILE=%~dp0VoxelDemo.sln
+
+rem Launch Visual Studio - either professional (devenv) or Express, as available
+if exist "%DevEnvDir%\devenv.exe" (
+    start devenv.exe "%PRJFILE%" /useenv
+) else if exist "%DevEnvDir%\VCExpress.exe"  (
+    start VCExpress.exe "%PRJFILE%" /useenv
+) else (
+    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
+    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+)
+
--- a/samples/qt/voxeldemo/VoxelDemo-vc9.sln
+++ b/samples/qt/voxeldemo/VoxelDemo-vc9.sln
@@ -1,29 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGl", "OpenGl\OpenGl.vcproj", "{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} = {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.Build.0 = Debug|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.ActiveCfg = Release|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.Build.0 = Release|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.Build.0 = Debug|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.ActiveCfg = Release|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/samples/qt/voxeldemo/VoxelDemo.vcproj
+++ b/samples/qt/voxeldemo/VoxelDemo.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="8,00"
 	Name="VoxelDemo"
 	ProjectGUID="{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
-	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -45,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\inc,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories=".\inc,$(QTDIR)\include,$(QTDIR)\include\QtCore,$(QTDIR)\include\QtGui,$(CASROOT)\inc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WNT;QT_THREAD_SUPPORT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -74,11 +73,9 @@
 				OutputFile=".\Release/VoxelDemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib,$(QTDIR)\lib"
 				ProgramDatabaseFile=".\Release/VoxelDemo.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -101,6 +98,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\inc,$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories=".\inc,$(CASROOT)\inc,$(QTDIR)\include,$(QTDIR)\include\QtCore,$(QTDIR)\include\QtGui"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT;QT_THREAD_SUPPORT;TEST"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -165,13 +165,11 @@
 				OutputFile=".\Debug/VoxelDemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\libd,$(QTDIR)\lib"
 				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/VoxelDemo.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -194,6 +192,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -330,7 +331,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs=".\moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -340,7 +341,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs="moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -362,7 +363,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs=".\moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -372,7 +373,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs=".\moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
--- a/samples/qt/voxeldemo/env.bat
+++ b/samples/qt/voxeldemo/env.bat
@@ -1,16 +1,11 @@
@ECHO OFF

-IF not "%CASDEB%" EQU "" (
-SET BIN_DIR=Debug
-) ELSE (
+call %~dp0..\..\..\ros\env.bat
+
 SET BIN_DIR=Release
-)
+SET CSF_GraphicShr=OpenGl\Release\VoxelOpenGl.dll

-SET PATH=%~dp0%BIN_DIR%;%PATH%
-
-SET CSF_GraphicShr=OpenGl\%BIN_DIR%\VoxelOpenGl.dll
-
-SET PATH=%~dp0OpenGl\%BIN_DIR%;%PATH%
+SET PATH=OpenGl\Release;%QTDIR%\bin;%QTDIR%;%PATH%

 SET CSF_TEX_FONT=2
 SET MMGT_REENTRANT=1
--- a/samples/qt/voxeldemo/msvc.bat
+++ b/samples/qt/voxeldemo/msvc.bat
@@ -1,4 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% VoxelDemo-%VCVER%.sln
-if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" VoxelDemo-%VCVER%.sln
--- a/Show More
+++ b/Show More