0023741: Research and remove CSFDB support from OCCT if it is necessary

[occt.git] / samples / mfc / standard / mfcsample / adm / win / vc9 / mfcsample.vcproj

diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
index f8bfe03..d195df8 100644 (file)
--- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
@@ -53,8 +53,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
+                               AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
@@ -81,16 +81,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-<<<<<<< HEAD
-                               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 TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win32\vc9\bind/mfcsample.dll"
-=======
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib FWOSPlugin.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPrim.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win32\vc9\libd/mfcsample.dll"
->>>>>>> 9479c49... 0024927: Getting rid of "Persistent" functionality -- Samples and data
+                               OutputFile="../../../../win32\vc9\bind/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="$(CASROOT)/win32/vc9/libd"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../../win32\vc9\bind/mfcsample.pdb"
                                SubSystem="2"
@@ -155,8 +150,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
+                               AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
+                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
@@ -183,16 +178,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-<<<<<<< HEAD
-                               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 TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win64\vc9\bind/mfcsample.dll"
-=======
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib  FWOSPlugin.lib  TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib  TKPrim.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win64\vc9\libd/mfcsample.dll"
->>>>>>> 9479c49... 0024927: Getting rid of "Persistent" functionality -- Samples and data
+                               OutputFile="../../../../win64\vc9\bind/mfcsample.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
+                               AdditionalLibraryDirectories="$(CASROOT)/win64/vc9/libd"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../../win64\vc9\bind/mfcsample.pdb"
                                SubSystem="2"
@@ -258,8 +248,8 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
+                               AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
@@ -286,16 +276,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-<<<<<<< HEAD
-                               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 TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win32\vc9\bin/mfcsample.dll"
-=======
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib   TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib  TKPrim.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win32\vc9\lib/mfcsample.dll"
->>>>>>> 9479c49... 0024927: Getting rid of "Persistent" functionality -- Samples and data
+                               OutputFile="../../../../win32\vc9\bin/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
+                               AdditionalLibraryDirectories="$(CASROOT)/win32/vc9/lib"
                                ProgramDatabaseFile="../../../../win32\vc9\bin/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
@@ -360,8 +345,8 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
+                               AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
@@ -388,16 +373,11 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-<<<<<<< HEAD
-                               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 TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win64\vc9\bin/mfcsample.dll"
-=======
                                AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib   TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib  TKPrim.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV3d.lib TKOpenGl.lib"
-                               OutputFile="../../../../win64\vc9\lib/mfcsample.dll"
->>>>>>> 9479c49... 0024927: Getting rid of "Persistent" functionality -- Samples and data
+                               OutputFile="../../../../win64\vc9\bin/mfcsample.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
+                               AdditionalLibraryDirectories="$(CASROOT)/win64/vc9/lib"
                                ProgramDatabaseFile="../../../../win64\vc9\bin/mfcsample.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"