From 1a5add58a297fe849f5ffadea5d12118401d96c1 Mon Sep 17 00:00:00 2001 From: ski Date: Tue, 19 May 2015 10:54:14 +0300 Subject: [PATCH] 0026226: Can't compile and run OCC mfs samples Files ISession2D_SensitiveCurve.h and ISession2D_SensitiveCurve.cpp were removed from mfc Geometry sample. Output directory for mfcsample project was changed from lib/libd to bin/bind. --- .../01_Geometry/adm/win/vc11/Geometry.vcxproj | 19 ------- .../adm/win/vc11/Geometry.vcxproj.filters | 6 --- .../01_Geometry/adm/win/vc12/Geometry.vcxproj | 19 ------- .../adm/win/vc12/Geometry.vcxproj.filters | 6 --- .../01_Geometry/adm/win/vc8/Geometry.vcproj | 52 ------------------- .../01_Geometry/adm/win/vc9/Geometry.vcproj | 52 ------------------- .../mfcsample/adm/win/vc10/mfcsample.vcxproj | 36 ++++++------- .../mfcsample/adm/win/vc11/mfcsample.vcxproj | 36 ++++++------- .../mfcsample/adm/win/vc12/mfcsample.vcxproj | 36 ++++++------- .../mfcsample/adm/win/vc8/mfcsample.vcproj | 34 ++++++------ .../mfcsample/adm/win/vc9/mfcsample.vcproj | 32 ++++++------ 11 files changed, 81 insertions(+), 247 deletions(-) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj index 0291dc570c..4922eb6e29 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -461,24 +461,6 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - true - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - true - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled %(AdditionalIncludeDirectories) @@ -592,7 +574,6 @@ - diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj.filters b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj.filters index 812b3b1160..185f27ebaa 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj.filters +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj.filters @@ -54,9 +54,6 @@ Source Files\ISession2d - - Source Files\ISession2d - Source Files\ISession2d @@ -106,9 +103,6 @@ Header Files - - Header Files - Header Files diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj index 92173c3985..160bdd6d24 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -461,24 +461,6 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - true - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - true - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled %(AdditionalIncludeDirectories) @@ -592,7 +574,6 @@ - diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters index 812b3b1160..185f27ebaa 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters @@ -54,9 +54,6 @@ Source Files\ISession2d - - Source Files\ISession2d - Source Files\ISession2d @@ -106,9 +103,6 @@ Header Files - - Header Files - Header Files 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 12e712a256..7d6b3a9922 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -999,54 +999,6 @@ /> - - - - - - - - - - - - - - @@ -1329,10 +1281,6 @@ RelativePath="..\..\..\src\ISession2D\ISession2D_Curve.h" > - - 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 5884032b43..8d3676330b 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj @@ -996,54 +996,6 @@ /> - - - - - - - - - - - - - - @@ -1326,10 +1278,6 @@ RelativePath="..\..\..\src\ISession2D\ISession2D_Curve.h" > - - diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj index e5f5c8e9a1..2f9b8263fd 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj @@ -66,16 +66,16 @@ <_ProjectFileVersion>10.0.30319.1 - ../../../../win32\vc10\libd\ + ../../../../win32\vc10\bind\ .\win32\objd\ true - ../../../../win64\vc10\libd\ + ../../../../win64\vc10\bind\ .\win64\objd\ true - ../../../../win32\vc10\lib\ + ../../../../win32\vc10\bin\ .\win32\obj\ false - ../../../../win64\vc10\lib\ + ../../../../win64\vc10\bin\ .\win64\obj\ false @@ -112,14 +112,13 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win32\vc10\libd/mfcsample.dll + ../../../../win32\vc10\bind/mfcsample.dll true $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) true - ../../../../win32\vc10\libd/mfcsample.pdb + ../../../../win32\vc10\bind/mfcsample.pdb Windows - - + ../../../../win32\vc10\libd/mfcsample.lib MachineX86 @@ -156,14 +155,13 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win64\vc10\libd/mfcsample.dll + ../../../../win64\vc10\bind/mfcsample.dll true $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) true - ../../../../win64\vc10\libd/mfcsample.pdb + ../../../../win64\vc10\bind/mfcsample.pdb Windows - - + ../../../../win64\vc10\libd/mfcsample.lib MachineX64 @@ -201,13 +199,12 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win32\vc10\lib/mfcsample.dll + ../../../../win32\vc10\bin/mfcsample.dll true $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - ../../../../win32\vc10\lib/mfcsample.pdb + ../../../../win32\vc10\bin/mfcsample.pdb Windows - - + ../../../../win32\vc10\lib/mfcsample.lib MachineX86 @@ -246,13 +243,12 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win64\vc10\lib/mfcsample.dll + ../../../../win64\vc10\bin/mfcsample.dll true $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - ../../../../win64\vc10\lib/mfcsample.pdb + ../../../../win64\vc10\bin/mfcsample.pdb Windows - - + ../../../../win64\vc10\lib/mfcsample.lib MachineX64 diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 246c776171..ca79684111 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -70,16 +70,16 @@ <_ProjectFileVersion>10.0.30319.1 - ../../../../win32\vc11\libd\ + ../../../../win32\vc11\bind\ .\win32\objd\ true - ../../../../win64\vc11\libd\ + ../../../../win64\vc11\bind\ .\win64\objd\ true - ../../../../win32\vc11\lib\ + ../../../../win32\vc11\bin\ .\win32\obj\ false - ../../../../win64\vc11\lib\ + ../../../../win64\vc11\bin\ .\win64\obj\ false @@ -116,14 +116,13 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win32\vc11\libd/mfcsample.dll + ../../../../win32\vc11\bind/mfcsample.dll true $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) true - ../../../../win32\vc11\libd/mfcsample.pdb + ../../../../win32\vc11\bind/mfcsample.pdb Windows - - + ../../../../win32\vc11\libd/mfcsample.lib MachineX86 @@ -160,14 +159,13 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win64\vc11\libd/mfcsample.dll + ../../../../win64\vc11\bind/mfcsample.dll true $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) true - ../../../../win64\vc11\libd/mfcsample.pdb + ../../../../win64\vc11\bind/mfcsample.pdb Windows - - + ../../../../win64\vc11\libd/mfcsample.lib MachineX64 @@ -205,13 +203,12 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win32\vc11\lib/mfcsample.dll + ../../../../win32\vc11\bin/mfcsample.dll true $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - ../../../../win32\vc11\lib/mfcsample.pdb + ../../../../win32\vc11\bin/mfcsample.pdb Windows - - + ../../../../win32\vc11\lib/mfcsample.lib MachineX86 @@ -250,13 +247,12 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win64\vc11\lib/mfcsample.dll + ../../../../win64\vc11\bin/mfcsample.dll true $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - ../../../../win64\vc11\lib/mfcsample.pdb + ../../../../win64\vc11\bin/mfcsample.pdb Windows - - + ../../../../win64\vc11\lib/mfcsample.lib MachineX64 diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index 34c2e3931f..4fae97e5e2 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -70,16 +70,16 @@ <_ProjectFileVersion>10.0.30319.1 - ../../../../win32\vc12\libd\ + ../../../../win32\vc12\bind\ .\win32\objd\ true - ../../../../win64\vc12\libd\ + ../../../../win64\vc12\bind\ .\win64\objd\ true - ../../../../win32\vc12\lib\ + ../../../../win32\vc12\bin\ .\win32\obj\ false - ../../../../win64\vc12\lib\ + ../../../../win64\vc12\bin\ .\win64\obj\ false @@ -116,14 +116,13 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win32\vc12\libd/mfcsample.dll + ../../../../win32\vc12\bind/mfcsample.dll true $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) true - ../../../../win32\vc12\libd/mfcsample.pdb + ../../../../win32\vc12\bind/mfcsample.pdb Windows - - + ../../../../win32\vc12\libd/mfcsample.lib MachineX86 @@ -160,14 +159,13 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win64\vc12\libd/mfcsample.dll + ../../../../win64\vc12\bind/mfcsample.dll true $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) true - ../../../../win64\vc12\libd/mfcsample.pdb + ../../../../win64\vc12\bind/mfcsample.pdb Windows - - + ../../../../win64\vc12\libd/mfcsample.lib MachineX64 @@ -205,13 +203,12 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win32\vc12\lib/mfcsample.dll + ../../../../win32\vc12\bin/mfcsample.dll true $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) - ../../../../win32\vc12\lib/mfcsample.pdb + ../../../../win32\vc12\bin/mfcsample.pdb Windows - - + ../../../../win32\vc12\lib/mfcsample.lib MachineX86 @@ -250,13 +247,12 @@ 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;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) - ../../../../win64\vc12\lib/mfcsample.dll + ../../../../win64\vc12\bin/mfcsample.dll true $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) - ../../../../win64\vc12\lib/mfcsample.pdb + ../../../../win64\vc12\bin/mfcsample.pdb Windows - - + ../../../../win32\vc12\lib/mfcsample.lib MachineX64 diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index ab5526103e..81adb67639 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -20,7 +20,7 @@