0023095: Porting demo and samples on OCCT 6.5.3

Fix for paths in *.vcproj files in MFC sample
Fixed scripts for QT samples on Linux platform

diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
index 2a86767..7e93e9a 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -128,7 +128,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -142,10 +142,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -171,7 +171,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -183,10 +183,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -215,7 +215,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -227,10 +227,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../..\x64\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
index 81706b7..2f25a3e 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
+                               TypeLibraryName=".\win32\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
+                               TypeLibraryName=".\x64\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -158,10 +158,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Geometry.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -216,8 +216,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -242,7 +242,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
+                               TypeLibraryName=".\win32\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -254,10 +254,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -315,8 +315,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -341,7 +341,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
+                               TypeLibraryName=".\x64\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -353,10 +353,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Geometry.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\\x64\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
index 6688448..b36b227 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
+                               TypeLibraryName=".\win32\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
+                               TypeLibraryName=".\x64\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -158,10 +158,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Geometry.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -215,8 +215,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -241,7 +241,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
+                               TypeLibraryName=".\win32\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -253,10 +253,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -313,8 +313,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -339,7 +339,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
+                               TypeLibraryName=".\x64\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -351,10 +351,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Geometry.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
+                               OutputFile="../../../..\\x64\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
index a092667..ff739b6 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -97,10 +97,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -139,10 +139,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -183,10 +183,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -225,10 +225,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
index d3c8d7b..dbb56f4 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win32\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -58,10 +58,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\x64\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win32\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -254,10 +254,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\x64\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -351,10 +351,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
index 8389abf..b22bb96 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win32\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -59,10 +59,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\x64\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
+                               OutputFile="../../../..\x64\vc9\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win32\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -253,10 +253,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\x64\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
index 7312fac..dc6d8d9 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -181,10 +181,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
index c16bbd5..b2e9a58 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win32\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\x64\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win32\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -252,10 +252,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\x64\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
index f9dbebb..81b5f2d 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win32\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\x64\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win32\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -251,10 +251,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\x64\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
+                               OutputFile="../../../..\x64\vc9\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
index 34bfc52..3e84d69 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -181,10 +181,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -212,7 +212,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -224,10 +224,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
index b3ae647..310fc94 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win32\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\x64\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win32\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -252,10 +252,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -312,8 +312,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -338,7 +338,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\x64\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -350,10 +350,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
index 9312d50..ec15ca4 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win32\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\x64\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win32\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -251,10 +251,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -310,8 +310,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -336,7 +336,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\x64\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -348,10 +348,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
index 3a024e7..859f9aa 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -181,10 +181,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
index 819de37..95918f8 100644 (file)
--- 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="../../../../win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../../win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win32\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../win32\vc8\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../../win32\vc8\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../x64\vc8\bin"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\x64\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../x64\vc8\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../../x64\vc8\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win32\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -252,10 +252,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../win32\vc8\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win32\vc8\bind/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\x64\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../x64\vc8\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../x64\vc8\bind/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
index bf51b00..e9e6b2f 100644 (file)
--- 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="../../../../win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../../win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win32\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../win32\vc9\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../../win32\vc9\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../x64\vc9\bin"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
+                               TypeLibraryName=".\x64\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
+                               OutputFile="../../../../x64\vc9\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../../x64\vc9\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win32\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -251,10 +251,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../win32\vc9\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win32\vc9\bind/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
+                               TypeLibraryName=".\x64\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
+                               OutputFile="../../../../x64\vc9\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../x64\vc9\bind/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
index 05459c0..e37959a 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -181,10 +181,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
index c752bde..1fa8662 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win32\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\x64\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
+                               TypeLibraryName=".\win32\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -252,10 +252,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
+                               TypeLibraryName=".\x64\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
index 1f6324f..a756ced 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win32\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Ocaf.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
+                               TypeLibraryName=".\x64\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Ocaf.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
+                               TypeLibraryName=".\win32\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -251,10 +251,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Ocaf.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
+                               TypeLibraryName=".\x64\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
+                               OutputFile="../../../..\x64\vc9\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Ocaf.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
index 1531247..0dbb675 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -181,10 +181,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
index 33b2632..af2e426 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
+                               TypeLibraryName=".\win32\obj/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Triangulation.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Triangulation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Triangulation.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
+                               TypeLibraryName=".\x64\obj/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Triangulation.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Triangulation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Triangulation.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
+                               TypeLibraryName=".\win32\objd/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -252,10 +252,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Triangulation.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Triangulation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Triangulation.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
+                               TypeLibraryName=".\x64\objd/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Triangulation.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Triangulation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Triangulation.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
index 844ced2..fc22c02 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
+                               TypeLibraryName=".\win32\obj/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Triangulation.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Triangulation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Triangulation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
+                               TypeLibraryName=".\x64\obj/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Triangulation.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Triangulation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Triangulation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
+                               TypeLibraryName=".\win32\objd/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -251,10 +251,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Triangulation.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Triangulation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Triangulation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
+                               TypeLibraryName=".\x64\objd/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Triangulation.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
+                               OutputFile="../../../..\x64\vc9\bind/Triangulation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Triangulation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
index 9438c9b..f65b160 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -99,10 +99,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -181,10 +181,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
index 38b6bce..a3b8365 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
+                               TypeLibraryName=".\win32\obj/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/HLR.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
+                               OutputFile="../../../..\win32\vc8\bin/HLR.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/HLR.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
+                               TypeLibraryName=".\x64\obj/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/HLR.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
+                               OutputFile="../../../..\x64\vc8\bin/HLR.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/HLR.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
+                               TypeLibraryName=".\win32\objd/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -252,10 +252,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/HLR.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
+                               OutputFile="../../../..\win32\vc8\bind/HLR.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/HLR.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
+                               TypeLibraryName=".\x64\objd/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/HLR.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
+                               OutputFile="../../../..\x64\vc8\bind/HLR.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/HLR.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
index defea11..5c5bed5 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
+                               TypeLibraryName=".\win32\obj/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/HLR.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
+                               OutputFile="../../../..\win32\vc9\bin/HLR.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/HLR.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
+                               TypeLibraryName=".\x64\obj/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/HLR.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
+                               OutputFile="../../../..\x64\vc9\bin/HLR.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/HLR.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
+                               TypeLibraryName=".\win32\objd/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -251,10 +251,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/HLR.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
+                               OutputFile="../../../..\win32\vc9\bind/HLR.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/HLR.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
+                               TypeLibraryName=".\x64\objd/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/HLR.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
+                               OutputFile="../../../..\x64\vc9\bind/HLR.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/HLR.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
index 8b84749..65fc074 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -97,10 +97,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -139,10 +139,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,7 +169,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -183,10 +183,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -225,10 +225,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
index 4a8e6cd..b1bfb9e 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
+                               TypeLibraryName=".\win32\objd/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -58,10 +58,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Animation.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Animation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Animation.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
+                               TypeLibraryName=".\x64\objd/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Animation.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Animation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Animation.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -214,8 +214,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -240,7 +240,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
+                               TypeLibraryName=".\win32\obj/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -254,10 +254,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Animation.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Animation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Animation.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
+                               TypeLibraryName=".\x64\obj/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -351,10 +351,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Animation.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Animation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Animation.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
index f1e3ee7..7fee70f 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
+                               TypeLibraryName=".\win32\objd/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -59,10 +59,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Animation.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Animation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Animation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
+                               TypeLibraryName=".\x64\objd/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Animation.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
+                               OutputFile="../../../..\x64\vc9\bind/Animation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Animation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -239,7 +239,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
+                               TypeLibraryName=".\win32\obj/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -253,10 +253,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Animation.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Animation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Animation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
+                               TypeLibraryName=".\x64\obj/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Animation.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Animation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Animation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
index c8c06ac..45116fb 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -100,10 +100,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bin/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win32\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bin/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>false</OptimizeReferences>
       <TargetMachine>MachineX86</TargetMachine>
@@ -130,7 +130,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -145,10 +145,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bin/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\x64\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bin/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>false</OptimizeReferences>
       <TargetMachine>MachineX64</TargetMachine>
@@ -175,7 +175,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -188,10 +188,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../win32\vc10\bind/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win32\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\bind/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -219,7 +219,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -232,10 +232,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../x64\vc10\bind/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\x64\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\bind/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>

diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
index 8bc9fb3..223f8cd 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
+                               TypeLibraryName=".\win32\obj/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -60,10 +60,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Convert.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
+                               OutputFile="../../../..\win32\vc8\bin/Convert.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ManifestFile=".\win32\obj\$(TargetFileName).intermediate.manifest"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Convert.pdb"
                                SubSystem="2"
                                OptimizeReferences="1"
                                TargetMachine="1"
@@ -119,8 +119,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc8\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -145,7 +145,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
+                               TypeLibraryName=".\x64\obj/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -159,10 +159,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Convert.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
+                               OutputFile="../../../..\x64\vc8\bin/Convert.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ManifestFile=".\x64\obj\$(TargetFileName).intermediate.manifest"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Convert.pdb"
                                SubSystem="2"
                                OptimizeReferences="1"
                                TargetMachine="17"
@@ -218,8 +218,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -244,7 +244,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
+                               TypeLibraryName=".\win32\objd/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -256,10 +256,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Convert.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
+                               OutputFile="../../../..\win32\vc8\bind/Convert.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
-                               ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+                               ManifestFile=".\win32\objd\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Convert.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        />
@@ -316,8 +316,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc8\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -342,7 +342,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
+                               TypeLibraryName=".\x64\objd/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -354,10 +354,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Convert.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
+                               OutputFile="../../../..\x64\vc8\bind/Convert.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
-                               ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               ManifestFile=".\x64\objd\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Convert.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />

diff --git a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
index 2922d4f..b19708f 100644 (file)
--- 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="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\win32\vc9\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
+                               TypeLibraryName=".\win32\obj/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -61,10 +61,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/Convert.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
+                               OutputFile="../../../..\win32\vc9\bin/Convert.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
-                               ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OPT_LIB32)"
+                               ManifestFile=".\win32\obj\$(TargetFileName).intermediate.manifest"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bin/Convert.pdb"
                                SubSystem="2"
                                OptimizeReferences="1"
                                RandomizedBaseAddress="1"
@@ -119,8 +119,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../..\x64\vc9\bin"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -145,7 +145,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
+                               TypeLibraryName=".\x64\obj/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -159,10 +159,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/Convert.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
+                               OutputFile="../../../..\x64\vc9\bin/Convert.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
-                               ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ManifestFile=".\x64\obj\$(TargetFileName).intermediate.manifest"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Convert.pdb"
                                SubSystem="2"
                                OptimizeReferences="1"
                                RandomizedBaseAddress="1"
@@ -217,8 +217,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\win32\vc9\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -243,7 +243,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
+                               TypeLibraryName=".\win32\objd/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -255,10 +255,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/Convert.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
+                               OutputFile="../../../..\win32\vc9\bind/Convert.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
-                               ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OPT_LIB32D)"
+                               ManifestFile=".\win32\objd\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
+                               ProgramDatabaseFile="../../../..\win32\vc9\bind/Convert.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -314,8 +314,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../..\x64\vc9\bind"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -340,7 +340,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
+                               TypeLibraryName=".\x64\objd/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -352,10 +352,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/Convert.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
+                               OutputFile="../../../..\x64\vc9\bind/Convert.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
-                               ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
+                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               ManifestFile=".\x64\objd\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
+                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Convert.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/All-vc10.sln b/samples/mfc/standard/All-vc10.sln
index ee632d1..74cead6 100644 (file)
--- 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\%VCVER%\Geometry.vcxproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc10\Geometry.vcxproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\%VCVER%\Modeling.vcxproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc10\Modeling.vcxproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\%VCVER%\Viewer2d.vcxproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc10\Viewer2d.vcxproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\%VCVER%\Viewer3d.vcxproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc10\Viewer3d.vcxproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\%VCVER%\ImportExport.vcxproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc10\ImportExport.vcxproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\%VCVER%\Ocaf.vcxproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc10\Ocaf.vcxproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\%VCVER%\Triangulation.vcxproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc10\Triangulation.vcxproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\%VCVER%\HLR.vcxproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc10\HLR.vcxproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\%VCVER%\Animation.vcxproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc10\Animation.vcxproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\%VCVER%\mfcsample.vcxproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc10\mfcsample.vcxproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\%VCVER%\Convert.vcxproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc10\Convert.vcxproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/samples/mfc/standard/All-vc8.sln b/samples/mfc/standard/All-vc8.sln
index b8dc3fd..c54e4a5 100644 (file)
--- 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\%VCVER%\Geometry.vcproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc8\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\%VCVER%\Modeling.vcproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc8\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\%VCVER%\Viewer2d.vcproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc8\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\%VCVER%\Viewer3d.vcproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc8\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\%VCVER%\ImportExport.vcproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc8\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\%VCVER%\Ocaf.vcproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc8\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\%VCVER%\Triangulation.vcproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc8\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\%VCVER%\HLR.vcproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc8\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\%VCVER%\Animation.vcproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc8\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\%VCVER%\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc8\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\%VCVER%\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc8\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
        ProjectSection(ProjectDependencies) = postProject
                {2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
        EndProjectSection

diff --git a/samples/mfc/standard/All-vc9.sln b/samples/mfc/standard/All-vc9.sln
index 129d24a..0f3fbaf 100644 (file)
--- 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\%VCVER%\Geometry.vcproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc9\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\%VCVER%\Modeling.vcproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc9\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\%VCVER%\Viewer2d.vcproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc9\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\%VCVER%\Viewer3d.vcproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc9\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\%VCVER%\ImportExport.vcproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc9\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\%VCVER%\Ocaf.vcproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc9\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\%VCVER%\Triangulation.vcproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc9\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\%VCVER%\HLR.vcproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc9\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\%VCVER%\Animation.vcproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc9\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\%VCVER%\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc9\mfcsample.vcproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\%VCVER%\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc9\Convert.vcproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}"
        ProjectSection(ProjectDependencies) = postProject
                {2D6CBBE8-6965-4016-B503-0D715AE26691} = {2D6CBBE8-6965-4016-B503-0D715AE26691}
        EndProjectSection

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
index 160458b..4289d09 100644 (file)
--- 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'">../../../../win$(ARCH)\$(VCVER)\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,7 +85,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\objd/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -97,10 +97,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win32\vc10\libd/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\libd/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -129,7 +129,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\objd/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../x64\vc10\libd/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\libd/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -173,7 +173,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win32\obj/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -187,10 +187,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win32\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win32\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win32\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>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win32\vc10\lib/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win32\vc10\lib/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -217,7 +217,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\win$(ARCH)\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\x64\obj/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -231,10 +231,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\x64\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\x64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\x64\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>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../x64\vc10\lib/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../x64\vc10\lib/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
index be26ba8..617f97a 100644 (file)
--- 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="../../../../win$(ARCH)\$(VCVER)\libd"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../win32\vc8\libd"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -46,7 +46,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
+                               TypeLibraryName=".\win32\objd/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -58,10 +58,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/mfcsample.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
+                               OutputFile="../../../../win32\vc8\libd/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win32\vc8\libd/mfcsample.pdb"
                                SubSystem="2"
                                ImportLibrary=""
                                TargetMachine="1"
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\libd"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../x64\vc8\libd"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
+                               TypeLibraryName=".\x64\objd/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -156,10 +156,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/mfcsample.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
+                               OutputFile="../../../../x64\vc8\libd/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../x64\vc8\libd/mfcsample.pdb"
                                SubSystem="2"
                                ImportLibrary=""
                                TargetMachine="17"
@@ -216,8 +216,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../../win32\vc8\lib"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -242,7 +242,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
+                               TypeLibraryName=".\win32\obj/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -256,10 +256,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/mfcsample.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
+                               OutputFile="../../../../win32\vc8\lib/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win32\vc8\lib/mfcsample.pdb"
                                SubSystem="2"
                                ImportLibrary=""
                                TargetMachine="1"
@@ -314,8 +314,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../../x64\vc8\lib"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -340,7 +340,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
+                               TypeLibraryName=".\x64\obj/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -354,10 +354,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/mfcsample.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
+                               OutputFile="../../../../x64\vc8\lib/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../x64\vc8\lib/mfcsample.pdb"
                                SubSystem="2"
                                ImportLibrary=""
                                TargetMachine="17"

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
index 973e209..918b751 100644 (file)
--- 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="../../../../win$(ARCH)\$(VCVER)\libd"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../win32\vc9\libd"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -47,7 +47,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
+                               TypeLibraryName=".\win32\objd/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -59,10 +59,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\win32\objd/mfcsample.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
+                               OutputFile="../../../../win32\vc9\libd/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win32\vc9\libd/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\libd"
-                       IntermediateDirectory=".\win$(ARCH)\objd"
+                       OutputDirectory="../../../../x64\vc9\libd"
+                       IntermediateDirectory=".\x64\objd"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
+                               TypeLibraryName=".\x64\objd/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -156,10 +156,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\objd/"
-                               ObjectFile=".\win$(ARCH)\objd/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\objd/"
+                               PrecompiledHeaderFile=".\x64\objd/mfcsample.pch"
+                               AssemblerListingLocation=".\x64\objd/"
+                               ObjectFile=".\x64\objd/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
+                               OutputFile="../../../../x64\vc9\libd/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../x64\vc9\libd/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -215,8 +215,8 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../../win32\vc9\lib"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -241,7 +241,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
+                               TypeLibraryName=".\win32\obj/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -255,10 +255,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\win32\obj/mfcsample.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\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="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
+                               OutputFile="../../../../win32\vc9\lib/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win32\vc9\lib/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -312,8 +312,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
-                       IntermediateDirectory=".\win$(ARCH)\obj"
+                       OutputDirectory="../../../../x64\vc9\lib"
+                       IntermediateDirectory=".\x64\obj"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -338,7 +338,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
+                               TypeLibraryName=".\x64\obj/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -352,10 +352,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
-                               AssemblerListingLocation=".\win$(ARCH)\obj/"
-                               ObjectFile=".\win$(ARCH)\obj/"
-                               ProgramDataBaseFileName=".\win$(ARCH)\obj/"
+                               PrecompiledHeaderFile=".\x64\obj/mfcsample.pch"
+                               AssemblerListingLocation=".\x64\obj/"
+                               ObjectFile=".\x64\obj/"
+                               ProgramDataBaseFileName=".\x64\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="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
+                               OutputFile="../../../../x64\vc9\lib/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../x64\vc9\lib/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index dc227f8..852b28b 100644 (file)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -6,10 +6,6 @@ TARGET = IESample
 HEADERS = src/*.h
 SOURCES = src/*.cxx
 
-INCLUDES = $$(CSF_OPT_INC)
-PATHS = $$split(INCLUDES,";")
-for(path, PATHS):INCLUDEPATH += $${path}
-
 TS_FILES = ./src/Common-icon.ts \
            ./src/Common-string.ts \
            ./src/Interface-string.ts
@@ -17,6 +13,13 @@ 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
@@ -28,18 +31,16 @@ 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$(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
-    }
+    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+    LIBS += -lfreeimageplus
+    LIBS += -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) {
@@ -128,11 +129,11 @@ win32 {
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
-LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
-        TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
-        TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
-        TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
-        TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
+LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
+        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
+        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
+        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
+        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
 lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm

diff --git a/samples/qt/IESample/custom.sh b/samples/qt/IESample/custom.sh
new file mode 100644 (file)
index 0000000..4506c96
--- /dev/null
+++ b/samples/qt/IESample/custom.sh
@@ -0,0 +1,19 @@
+#!/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}
\ No newline at end of file

diff --git a/samples/qt/IESample/env.sh b/samples/qt/IESample/env.sh
new file mode 100644 (file)
index 0000000..01a895b
--- /dev/null
+++ b/samples/qt/IESample/env.sh
@@ -0,0 +1,5 @@
+#!/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:"

diff --git a/samples/qt/IESample/make.sh b/samples/qt/IESample/make.sh
new file mode 100644 (file)
index 0000000..df89ed0
--- /dev/null
+++ b/samples/qt/IESample/make.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+cd $aSamplePath
+qmake IESample.pro
+make

diff --git a/samples/qt/IESample/run.sh b/samples/qt/IESample/run.sh
index 8fc508e..0732dda 100755 (executable)
--- a/samples/qt/IESample/run.sh
+++ b/samples/qt/IESample/run.sh
@@ -1,60 +1,22 @@
 #!/bin/sh
 
-host=`uname -s`
-
-PROG_DIR=`dirname $0`
-ROOT_DIR=`(cd $PROG_DIR; pwd)`
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+cd $aSamplePath
 
-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
+host=`uname -s`
 STATION=$host
 
-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"
+RES_DIR="${aSamplePath}/res"
+BIN_DIR="${aSamplePath}/${STATION}/bin"
 
 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 LD_LIBRARY_PATH
+export PATH
 
 if test ! -r "${BIN_DIR}/IESample"; then
    echo "Executable \"${BIN_DIR}/IESample\" not found."
@@ -63,4 +25,3 @@ if test ! -r "${BIN_DIR}/IESample"; then
 fi
 
 ${BIN_DIR}/IESample
-

diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index 92c5ce1..68e1a54 100755 (executable)
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -6,9 +6,6 @@ TARGET = Tutorial
 HEADERS = src/*.h
 SOURCES = src/*.cxx
 
-INCLUDES = $$(CSF_OPT_INC)
-PATHS = $$split(INCLUDES,";")
-for(path, PATHS):INCLUDEPATH += $${path}
 
 TS_FILES = ./src/Common-icon.ts \
            ./src/Common-string.ts \
@@ -18,6 +15,13 @@ 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
@@ -29,18 +33,16 @@ 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$(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
-    }
+    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+       LIBS += -lfreeimageplus
+       LIBS += -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) {
@@ -129,11 +131,11 @@ win32 {
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
-LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
-        TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
-        TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
-        TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
-        TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
+LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
+        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
+        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
+        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
+        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
 lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
@@ -141,4 +143,4 @@ 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
\ No newline at end of file

diff --git a/samples/qt/Tutorial/custom.sh b/samples/qt/Tutorial/custom.sh
new file mode 100644 (file)
index 0000000..4506c96
--- /dev/null
+++ b/samples/qt/Tutorial/custom.sh
@@ -0,0 +1,19 @@
+#!/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}
\ No newline at end of file

diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index 4985b2c..a3b4345 100755 (executable)
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,4 +1,4 @@
 SET RES_DIR=%~dp0res
 SET CSF_ResourcesDefaults=%RES_DIR%
-SET CSF_TuturialResourcesDefaults=%RES_DIR%
+SET CSF_TutorialResourcesDefaults=%RES_DIR%
 

diff --git a/samples/qt/Tutorial/env.sh b/samples/qt/Tutorial/env.sh
new file mode 100644 (file)
index 0000000..01a895b
--- /dev/null
+++ b/samples/qt/Tutorial/env.sh
@@ -0,0 +1,5 @@
+#!/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:"

diff --git a/samples/qt/Tutorial/make.sh b/samples/qt/Tutorial/make.sh
new file mode 100644 (file)
index 0000000..2ad7091
--- /dev/null
+++ b/samples/qt/Tutorial/make.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+cd $aSamplePath
+qmake Tutorial.pro
+make

diff --git a/samples/qt/Tutorial/run.sh b/samples/qt/Tutorial/run.sh
index 74c4d15..2bf6ce8 100755 (executable)
--- a/samples/qt/Tutorial/run.sh
+++ b/samples/qt/Tutorial/run.sh
@@ -1,58 +1,22 @@
 #!/bin/sh
 
-host=`uname -s`
-
-PROG_DIR=`dirname $0`
-ROOT_DIR=`(cd $PROG_DIR; pwd)`
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+cd $aSamplePath
 
-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
+host=`uname -s`
 STATION=$host
 
-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"
+RES_DIR="${aSamplePath}/res"
+BIN_DIR="${aSamplePath}/${STATION}/bin"
 
 CSF_ResourcesDefaults="${RES_DIR}"
-CSF_TuturialResourcesDefaults="${RES_DIR}"
+CSF_TutorialResourcesDefaults="${RES_DIR}"
 
 PATH="${BIN_DIR}:${PATH}"
 
-export CSF_GraphicShr CSF_UnitsLexicon CSF_UnitsDefinition
-export CSF_MDTVFontDirectory CSF_MDTVTexturesDirectory
-export CSF_TuturialResourcesDefaults CSF_ResourcesDefaults
-export PATH LD_LIBRARY_PATH
+export CSF_TutorialResourcesDefaults CSF_ResourcesDefaults
+export PATH
 
 if test ! -r "${BIN_DIR}/Tutorial"; then
    echo "Executable \"${BIN_DIR}/Tutorial\" not found."
@@ -61,4 +25,3 @@ if test ! -r "${BIN_DIR}/Tutorial"; then
 fi
 
 ${BIN_DIR}/Tutorial
-

diff --git a/samples/qt/Tutorial/src/ApplicationTut.cxx b/samples/qt/Tutorial/src/ApplicationTut.cxx
index ab0156d..663f142 100755 (executable)
--- 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_TuturialResourcesDefaults" ) );
+    static QString resDir( ::getenv( "CSF_TutorialResourcesDefaults" ) );
     return resDir;
 }