0023500: MFC texture example is crashed when view closed

x64 sample build directory has been changed to win64

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 7e93e9a268c3279312103d6a1aa240675988747c..aba0eca7264cb9742fda617c4e3fdbadb84f42fb 100644 (file)
--- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -128,7 +128,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -142,10 +142,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -156,11 +156,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -215,7 +215,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -227,10 +227,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -243,12 +243,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../..\x64\vc10\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../..\win64\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 2f25a3e3058a9859b63f73334284989f47875e0b..2bb157a274f334553c7c7a69facdd77e54b7f8f7 100644 (file)
--- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Geometry.tlb"
+                               TypeLibraryName=".\win64\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -158,10 +158,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Geometry.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -180,12 +180,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Geometry.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Geometry.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -315,8 +315,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -341,7 +341,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Geometry.tlb"
+                               TypeLibraryName=".\win64\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -353,10 +353,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Geometry.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -377,13 +377,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\\x64\vc8\bind/Geometry.exe"
+                               OutputFile="../../../..\\win64\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 b36b227cb5835f078044d82679b90451bdfabfee..e5b45fd44b9452951a9afd1c175bb842249b5c30 100644 (file)
--- a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Geometry.tlb"
+                               TypeLibraryName=".\win64\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -158,10 +158,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Geometry.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -180,12 +180,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Geometry.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/Geometry.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -313,8 +313,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -339,7 +339,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Geometry.tlb"
+                               TypeLibraryName=".\win64\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -351,10 +351,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Geometry.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -375,13 +375,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\\x64\vc9\bind/Geometry.exe"
+                               OutputFile="../../../..\\win64\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 ff739b601df4ce67d236e6ef7338d01fb7045459..420b48e91ea0eb40149e0c21924475530b93aea3 100644 (file)
--- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -139,10 +139,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -154,11 +154,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -225,10 +225,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -239,10 +239,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\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 dbb56f4df2746c1bd204d6455f4713904c266222..b80aaea03c13615d6e48aa76cb3f1d87b40d9ac3 100644 (file)
--- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win64\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -178,12 +178,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Modeling.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bind/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win64\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -351,10 +351,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -373,11 +373,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Modeling.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\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 b22bb962acc9b95a03bf110d5b5003342cce1547..8e510516e56035c90998f01c235f47551bf96fa4 100644 (file)
--- a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win64\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -178,12 +178,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\x64\vc9\bind/Modeling.exe"
+                               OutputFile="../../../..\win64\vc9\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Modeling.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bind/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/TopologyTransformations.tlb"
+                               TypeLibraryName=".\win64\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -371,11 +371,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Modeling.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\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 dc6d8d95106b296bbd7a21da39d49041dc8addf9..2d730414b949c13f645968a41a4c97568ce3dc58 100644 (file)
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 b2e9a58936df14955dff481c4347c1fc0e444621..41c459741c2220564554fbe8508ee9cb768bdea5 100644 (file)
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win64\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win64\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -372,12 +372,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 81b5f2d1d957e83002793004fe6438a814cb3a67..8fb1f4bfd049c99649a8e0af450884914727fd85 100644 (file)
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Viewer2d.tlb"
+                               TypeLibraryName=".\win64\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Viewer2d.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Viewer2d.tlb"
+                               TypeLibraryName=".\win64\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -370,12 +370,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bind/Viewer2d.exe"
+                               OutputFile="../../../..\win64\vc9\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Viewer2d.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 63f3bb2233d4afb4e6fad692c65c24018c20732a..15fde70917f16efefc602fbdf7a0b9b08713d1e3 100644 (file)
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -212,7 +212,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -224,10 +224,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -240,11 +240,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 310fc942bea0e0cf0ea385cc3e4992e8a82b28b8..1492bdf6ced143a5a6655a9f0f2eede5b115a15a 100644 (file)
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win64\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -312,8 +312,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -338,7 +338,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win64\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -350,10 +350,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -374,12 +374,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Viewer3d.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 ec15ca46b20d79dbf20fc874ed2ad76266d923dc..6f6f413ae1a5f9f3cce2b94d72e0cccf5c896076 100644 (file)
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Viewer3d.tlb"
+                               TypeLibraryName=".\win64\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -310,8 +310,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -336,7 +336,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Viewer3d.tlb"
+                               TypeLibraryName=".\win64\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -348,10 +348,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -372,12 +372,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Viewer3d.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Viewer3d.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 859f9aa5107ebabb6804d6be36c27134c9f7b7f1..ec4c4251748353940fdabe853d8d0d7fe0273fa6 100644 (file)
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 95918f83b58cec5c50d156691c5736931c617cee..d9fb3a9fe11f6c135320dc6d0f39231b811a411a 100644 (file)
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../x64\vc8\bin"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../../win64\vc8\bin"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win64\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../x64\vc8\bin/ImportExport.exe"
+                               OutputFile="../../../../win64\vc8\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../x64\vc8\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../../win64\vc8\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../../win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win64\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -372,12 +372,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../x64\vc8\bind/ImportExport.exe"
+                               OutputFile="../../../../win64\vc8\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../x64\vc8\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win64\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 e9e6b2fc48361d3bde632be12e705b04fd2283b3..859d840d35a30643184af5f35deb5c464f79579a 100644 (file)
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../x64\vc9\bin"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../../win64\vc9\bin"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/ImportExport.tlb"
+                               TypeLibraryName=".\win64\obj/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/ImportExport.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../x64\vc9\bin/ImportExport.exe"
+                               OutputFile="../../../../win64\vc9\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../x64\vc9\bin/ImportExport.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../../win64\vc9\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../../win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/ImportExport.tlb"
+                               TypeLibraryName=".\win64\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/ImportExport.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -370,12 +370,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../../x64\vc9\bind/ImportExport.exe"
+                               OutputFile="../../../../win64\vc9\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../x64\vc9\bind/ImportExport.pdb"
+                               ProgramDatabaseFile="../../../../win64\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 e37959ad312df34b3a3a91cd2a91b2e463051cdf..51207d946dd20b8d10705dc27c7635f0f1fd7e00 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 1fa8662eee4a2f7612dcbaa519039dfc61efe4e8..cdcefa0a8d7f7d04370c876111a69b585763a123 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win64\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Ocaf.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Ocaf.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Ocaf.tlb"
+                               TypeLibraryName=".\win64\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -372,12 +372,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Ocaf.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 a756cedc4f38b7f7d9fbf63ef74ff5f6be67519e..b79d64736315d9feb1b71f4c76f2130394a10248 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Ocaf.tlb"
+                               TypeLibraryName=".\win64\obj/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Ocaf.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Ocaf.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Ocaf.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Ocaf.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Ocaf.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/Ocaf.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Ocaf.tlb"
+                               TypeLibraryName=".\win64\objd/Ocaf.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Ocaf.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Ocaf.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -370,12 +370,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bind/Ocaf.exe"
+                               OutputFile="../../../..\win64\vc9\bind/Ocaf.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Ocaf.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 0dbb6758516a798ee9756aa6b1d7bc84b433d622..5423ad4e52a8aeda272a2eb5a620a3975c98fa31 100644 (file)
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 af2e42651391e27097cc880be19efde8f2d0045c..66980d8928e703ef851ca9326a72430d32ab80ad 100644 (file)
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Triangulation.tlb"
+                               TypeLibraryName=".\win64\obj/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Triangulation.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Triangulation.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Triangulation.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Triangulation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Triangulation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Triangulation.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Triangulation.tlb"
+                               TypeLibraryName=".\win64\objd/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Triangulation.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Triangulation.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -372,12 +372,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Triangulation.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Triangulation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Triangulation.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 fc22c027510f9ed07a9b43abca6d02e2b09e5687..b2a26090f90201d4b7ac61a1bb1f2e900bb95a16 100644 (file)
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Triangulation.tlb"
+                               TypeLibraryName=".\win64\obj/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Triangulation.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Triangulation.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Triangulation.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Triangulation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Triangulation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/Triangulation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Triangulation.tlb"
+                               TypeLibraryName=".\win64\objd/Triangulation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Triangulation.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Triangulation.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -370,12 +370,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bind/Triangulation.exe"
+                               OutputFile="../../../..\win64\vc9\bind/Triangulation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Triangulation.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 f65b160e48e2210ccbd5e9a31a82536eb32cc0db..d257c1bfe49e0c6e919dcdff3494ab704e04f9a9 100644 (file)
--- a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -223,10 +223,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 a3b8365273c363520f86c5011b4b61287847e55c..26d4654069ceb63b8b992a809f84ad1fd37c3fc0 100644 (file)
--- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/HLR.tlb"
+                               TypeLibraryName=".\win64\obj/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/HLR.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/HLR.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bin/HLR.exe"
+                               OutputFile="../../../..\win64\vc8\bin/HLR.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/HLR.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/HLR.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/HLR.tlb"
+                               TypeLibraryName=".\win64\objd/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/HLR.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/HLR.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -372,12 +372,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bind/HLR.exe"
+                               OutputFile="../../../..\win64\vc8\bind/HLR.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/HLR.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 5c5bed58dd0a892d336ce58a8d524fdaa713edec..c93048139c3c513f8f0b67439299cff0cacd00df 100644 (file)
--- a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/HLR.tlb"
+                               TypeLibraryName=".\win64\obj/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -157,10 +157,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/HLR.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/HLR.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -179,11 +179,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/HLR.exe"
+                               OutputFile="../../../..\win64\vc9\bin/HLR.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/HLR.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/HLR.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/HLR.tlb"
+                               TypeLibraryName=".\win64\objd/HLR.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -347,10 +347,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/HLR.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/HLR.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -370,12 +370,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bind/HLR.exe"
+                               OutputFile="../../../..\win64\vc9\bind/HLR.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/HLR.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 f1fc1396c30eaf848ed1651052a39e8d0f9d1f60..928dedb7302cb37052e00eeaf0add8a594b76e7e 100644 (file)
--- a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -127,7 +127,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -139,10 +139,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -154,11 +154,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\vc10\bind/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -211,7 +211,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -225,10 +225,10 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -240,10 +240,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win64\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 b1bfb9e6defcd3ed9f36d85dd87d21d8caec8b62..e147d62ce1974686410a6e746c080ef7b426d53e 100644 (file)
--- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Animation.tlb"
+                               TypeLibraryName=".\win64\objd/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Animation.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Animation.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -178,12 +178,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Animation.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Animation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Animation.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bind/Animation.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        />
@@ -311,8 +311,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -337,7 +337,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Animation.tlb"
+                               TypeLibraryName=".\win64\obj/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -351,10 +351,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Animation.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Animation.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -373,11 +373,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Animation.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Animation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Animation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\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 7fee70f31520073ffae89568935ecd1964b8fd8e..9285871ed45d0dbece99410f4ea430eb11eda039 100644 (file)
--- a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
@@ -117,8 +117,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -143,7 +143,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Animation.tlb"
+                               TypeLibraryName=".\win64\objd/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -155,10 +155,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Animation.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Animation.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -178,12 +178,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\x64\vc9\bind/Animation.exe"
+                               OutputFile="../../../..\win64\vc9\bind/Animation.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Animation.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bind/Animation.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -335,7 +335,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Animation.tlb"
+                               TypeLibraryName=".\win64\obj/Animation.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -349,10 +349,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Animation.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Animation.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -371,11 +371,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Animation.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Animation.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Animation.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\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 45116fb63f6d5406d677e909d1f092272b79d4e6..9a0f3a0a69258b3f5954c0b45aa2d064524558a9 100644 (file)
--- a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win32\vc10\bind\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win32\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../x64\vc10\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -130,7 +130,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -145,10 +145,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -159,11 +159,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bin/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\x64\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../x64\vc10\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win64\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../win64\vc10\bin/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>false</OptimizeReferences>
       <TargetMachine>MachineX64</TargetMachine>
@@ -219,7 +219,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -232,10 +232,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -247,12 +247,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../win64\vc10\bind/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\x64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\x64\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win64\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 223f8cd25cad6d0fdfae1fbb881da562740e3fff..78142c3fa847d1373a90e11c426f8ac4bcc62e2c 100644 (file)
--- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
@@ -119,8 +119,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc8\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -145,7 +145,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Convert.tlb"
+                               TypeLibraryName=".\win64\obj/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -159,10 +159,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Convert.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Convert.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -181,12 +181,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bin/Convert.exe"
+                               OutputFile="../../../..\win64\vc8\bin/Convert.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ManifestFile=".\x64\obj\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bin/Convert.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ManifestFile=".\win64\obj\$(TargetFileName).intermediate.manifest"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Convert.pdb"
                                SubSystem="2"
                                OptimizeReferences="1"
                                TargetMachine="17"
@@ -316,8 +316,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc8\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -342,7 +342,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Convert.tlb"
+                               TypeLibraryName=".\win64\objd/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -354,10 +354,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Convert.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Convert.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -377,13 +377,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc8\bind/Convert.exe"
+                               OutputFile="../../../..\win64\vc8\bind/Convert.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc8\libd,$(CSF_OPT_LIB64D)"
-                               ManifestFile=".\x64\objd\$(TargetFileName).intermediate.manifest"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               ManifestFile=".\win64\objd\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc8\bind/Convert.pdb"
+                               ProgramDatabaseFile="../../../..\win64\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 b19708fe3d9a86b134f3b8a155761c853cfce0dd..f1a67a10ea33ffb0f6e3df5600984f444f6637d7 100644 (file)
--- a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
@@ -119,8 +119,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../..\x64\vc9\bin"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../..\win64\vc9\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -145,7 +145,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/Convert.tlb"
+                               TypeLibraryName=".\win64\obj/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -159,10 +159,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\x64\obj/Convert.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/Convert.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -181,12 +181,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bin/Convert.exe"
+                               OutputFile="../../../..\win64\vc9\bin/Convert.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\lib,$(CSF_OPT_LIB64)"
-                               ManifestFile=".\x64\obj\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bin/Convert.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OPT_LIB64)"
+                               ManifestFile=".\win64\obj\$(TargetFileName).intermediate.manifest"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bin/Convert.pdb"
                                SubSystem="2"
                                OptimizeReferences="1"
                                RandomizedBaseAddress="1"
@@ -314,8 +314,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../..\x64\vc9\bind"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../..\win64\vc9\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -340,7 +340,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/Convert.tlb"
+                               TypeLibraryName=".\win64\objd/Convert.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -352,10 +352,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="StdAfx.h"
-                               PrecompiledHeaderFile=".\x64\objd/Convert.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/Convert.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -375,13 +375,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-                               OutputFile="../../../..\x64\vc9\bind/Convert.exe"
+                               OutputFile="../../../..\win64\vc9\bind/Convert.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\x64\vc9\libd,$(CSF_OPT_LIB64D)"
-                               ManifestFile=".\x64\objd\$(TargetFileName).intermediate.manifest"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OPT_LIB64D)"
+                               ManifestFile=".\win64\objd\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\x64\vc9\bind/Convert.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc9\bind/Convert.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
index 4289d0914ce936293e2e4d833345881f43cdf2d0..cf6c24449396f9effc5402f17a5d5afd7ce32b48 100644 (file)
--- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
@@ -69,14 +69,14 @@
     <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'">../../../../x64\vc10\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win64\vc10\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win64\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win32\vc10\lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win32\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../x64\vc10\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win64\vc10\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win64\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -129,7 +129,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\objd/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -141,10 +141,10 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -156,11 +156,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win64\vc10\libd/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../x64\vc10\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\vc10\libd/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -217,7 +217,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\x64\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win64\obj/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
@@ -231,14 +231,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\x64\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\x64\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\x64\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\x64\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win64\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win64\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/p:ResGenExecuteAsTool=true;ResGenToolArchitecture=ManagedIL;ResGenTrackerSdkPath="%programfiles(x86)%\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\x64" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/p:ResGenExecuteAsTool=true;ResGenToolArchitecture=ManagedIL;ResGenTrackerSdkPath="%programfiles(x86)%\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\win64" %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -247,10 +247,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../x64\vc10\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win64\vc10\lib/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../x64\vc10\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win64\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 617f97ac33f789b90846d07359dbf0d771df77c3..7dfb31f50fdd91a66e1f08479c78b567f227d43a 100644 (file)
--- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../x64\vc8\libd"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../../win64\vc8\libd"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/mfcsample.tlb"
+                               TypeLibraryName=".\win64\objd/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -156,10 +156,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/mfcsample.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/mfcsample.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -179,12 +179,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-                               OutputFile="../../../../x64\vc8\libd/mfcsample.dll"
+                               OutputFile="../../../../win64\vc8\libd/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../x64\vc8\libd/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win64\vc8\libd/mfcsample.pdb"
                                SubSystem="2"
                                ImportLibrary=""
                                TargetMachine="17"
@@ -314,8 +314,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../x64\vc8\lib"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../../win64\vc8\lib"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -340,7 +340,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/mfcsample.tlb"
+                               TypeLibraryName=".\win64\obj/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -354,10 +354,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/mfcsample.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/mfcsample.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -376,11 +376,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-                               OutputFile="../../../../x64\vc8\lib/mfcsample.dll"
+                               OutputFile="../../../../win64\vc8\lib/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../x64\vc8\lib/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win64\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 918b751c16d502e1c8a61c8fdec3f668fbffb399..e150c78124fe46a65c91114e8a59a0053e9413fd 100644 (file)
--- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
@@ -118,8 +118,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="../../../../x64\vc9\libd"
-                       IntermediateDirectory=".\x64\objd"
+                       OutputDirectory="../../../../win64\vc9\libd"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -144,7 +144,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\objd/mfcsample.tlb"
+                               TypeLibraryName=".\win64\objd/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -156,10 +156,10 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\objd/mfcsample.pch"
-                               AssemblerListingLocation=".\x64\objd/"
-                               ObjectFile=".\x64\objd/"
-                               ProgramDataBaseFileName=".\x64\objd/"
+                               PrecompiledHeaderFile=".\win64\objd/mfcsample.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
@@ -179,12 +179,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-                               OutputFile="../../../../x64\vc9\libd/mfcsample.dll"
+                               OutputFile="../../../../win64\vc9\libd/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../../x64\vc9\libd/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win64\vc9\libd/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
@@ -312,8 +312,8 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="../../../../x64\vc9\lib"
-                       IntermediateDirectory=".\x64\obj"
+                       OutputDirectory="../../../../win64\vc9\lib"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
@@ -338,7 +338,7 @@
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\x64\obj/mfcsample.tlb"
+                               TypeLibraryName=".\win64\obj/mfcsample.tlb"
                                HeaderFileName=""
                        />
                        <Tool
@@ -352,10 +352,10 @@
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\x64\obj/mfcsample.pch"
-                               AssemblerListingLocation=".\x64\obj/"
-                               ObjectFile=".\x64\obj/"
-                               ProgramDataBaseFileName=".\x64\obj/"
+                               PrecompiledHeaderFile=".\win64\obj/mfcsample.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                CompileAs="0"
@@ -374,11 +374,11 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-                               OutputFile="../../../../x64\vc9\lib/mfcsample.dll"
+                               OutputFile="../../../../win64\vc9\lib/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../../x64\vc9\lib/mfcsample.pdb"
+                               ProgramDatabaseFile="../../../../win64\vc9\lib/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"

diff --git a/src/OpenGl/OpenGl_TextureBox.cxx b/src/OpenGl/OpenGl_TextureBox.cxx
index 5f9f139f4215d613c4e08dbc7bb8a01c5cb8d22d..8aa7dba273e604358a933a87173d0a2eb2b4c538 100755 (executable)
--- a/src/OpenGl/OpenGl_TextureBox.cxx
+++ b/src/OpenGl/OpenGl_TextureBox.cxx
@@ -685,7 +685,8 @@ void FreeTexture (const Handle(OpenGl_Context)& theContext,
     {
       Handle(OpenGl_ResourceTexture) aResource = new OpenGl_ResourceTexture (textab(ID).contextdata(i).number);
       
-      if (!theContext.IsNull()) {
+      if (!theContext.IsNull()) 
+      {
         theContext->DelayedRelease (aResource);
       }
     }