From: ski Date: Thu, 15 Oct 2015 12:02:18 +0000 (+0300) Subject: 0023741: Research and remove CSFDB support from OCCT if it is necessary X-Git-Tag: V7_0_0_beta~186 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=050c18ac17acbc3636b23f1259f2a839cd4e4c67;hp=c1a487e4684d909619d963375816493831aba92d 0023741: Research and remove CSFDB support from OCCT if it is necessary redundant CSFDB definition removed from compiler command line Remove *.csfbd files and CSFDB definition in the sample project --- diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake index 60b5872d25..8232afb40e 100644 --- a/adm/cmake/occt_defs_flags.cmake +++ b/adm/cmake/occt_defs_flags.cmake @@ -11,7 +11,6 @@ if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) endif() endif() -add_definitions (-DCSFDB) if (WIN32) add_definitions (-wd4996) elseif (APPLE) diff --git a/adm/genproj.tcl b/adm/genproj.tcl index 42b4893bef..3fcfec250f 100644 --- a/adm/genproj.tcl +++ b/adm/genproj.tcl @@ -2005,7 +2005,6 @@ proc osutils:cbpx { theOutDir theToolKit } { lappend anIncPaths "../../../inc" # extra macros - lappend aTKDefines "CSFDB" if { "$aWokStation" == "wnt" } { lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE" } else { @@ -2277,7 +2276,6 @@ proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theInc } # extra macros - lappend aTKDefines "CSFDB" if { "$aWokStation" == "wnt" } { lappend aTKDefines "_CRT_SECURE_NO_DEPRECATE" } else { @@ -2543,7 +2541,7 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap theIsStatic thePlatform {t set anExecExtension "\t\t\t\tEXECUTABLE_EXTENSION = dylib;" set anExecPrefix "\t\t\t\tEXECUTABLE_PREFIX = lib;" set aWrapperExtension "\t\t\t\tWRAPPER_EXTENSION = dylib;" - set aTKDefines [list "CSFDB" "OCC_CONVERT_SIGNALS"] + set aTKDefines [list "OCC_CONVERT_SIGNALS"] if { "$theTargetType" == "executable" } { set aPBXBuildPhase "CopyFiles" diff --git a/adm/templates/template.vc10 b/adm/templates/template.vc10 index 064aa2a7ce..9d1f97955c 100644 --- a/adm/templates/template.vc10 +++ b/adm/templates/template.vc10 @@ -85,7 +85,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -100,7 +100,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -128,7 +128,7 @@ true Disabled OnlyExplicitInline - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win32\__VCVER__\objd\__TKNAM__/ @@ -144,7 +144,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -173,7 +173,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -188,7 +188,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) @@ -216,7 +216,7 @@ true Disabled OnlyExplicitInline - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\__VCVER__\objd\__TKNAM__/ @@ -232,7 +232,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies) diff --git a/adm/templates/template.vc10x b/adm/templates/template.vc10x index 762ada84e6..ed4213de50 100644 --- a/adm/templates/template.vc10x +++ b/adm/templates/template.vc10x @@ -85,7 +85,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -100,7 +100,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -127,7 +127,7 @@ true Disabled OnlyExplicitInline - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win32\__VCVER__\objd\__XQTNAM__/ @@ -143,7 +143,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -171,7 +171,7 @@ true MaxSpeed OnlyExplicitInline - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) true Async MultiThreadedDLL @@ -186,7 +186,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) @@ -213,7 +213,7 @@ true Disabled OnlyExplicitInline - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) Async MultiThreadedDebugDLL .\..\..\..\win64\__VCVER__\objd\__XQTNAM__/ @@ -229,7 +229,7 @@ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) + _DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions) __TKDEP__;%(AdditionalDependencies) diff --git a/adm/templates/template.vc7 b/adm/templates/template.vc7 index 4a2f536beb..ff0e8ec1de 100644 --- a/adm/templates/template.vc7 +++ b/adm/templates/template.vc7 @@ -22,7 +22,7 @@ AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" + PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -62,7 +62,7 @@ @@ -89,7 +89,7 @@ AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" Optimization="0" InlineFunctionExpansion="1" - PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__" + PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__" BasicRuntimeChecks="3" RuntimeLibrary="3" PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch" @@ -131,7 +131,7 @@ diff --git a/adm/templates/template.vc7x b/adm/templates/template.vc7x index 769fc928f0..8adc18fa7e 100644 --- a/adm/templates/template.vc7x +++ b/adm/templates/template.vc7x @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" Optimization="0" - PreprocessorDefinitions="_DEBUG;CSFDB;$(CSF_DEFINES)__TKDEFS__" + PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__" BasicRuntimeChecks="3" RuntimeLibrary="3" AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/" @@ -61,7 +61,7 @@ @@ -86,7 +86,7 @@ AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" + PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -124,7 +124,7 @@ diff --git a/adm/templates/template.vc8 b/adm/templates/template.vc8 index b76c872a2a..6d6897a9c9 100644 --- a/adm/templates/template.vc8 +++ b/adm/templates/template.vc8 @@ -50,7 +50,7 @@ AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__" + PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__" StringPooling="true" ExceptionHandling="2" RuntimeLibrary="2" @@ -71,7 +71,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 e1f3079ef0..21ce01d814 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -182,7 +182,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -226,7 +226,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 08a1744832..57d22bbd37 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -182,7 +182,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -226,7 +226,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 5d7fd578f0..bddf957f69 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -151,7 +151,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -348,7 +348,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 006cbe8b28..360a0de7d9 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj @@ -248,7 +248,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -346,7 +346,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 3798deadcf..f9d198fb61 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj @@ -92,7 +92,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -134,7 +134,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj index 8281769ee4..1979d06381 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj index 846b40cd37..19a9ada9bf 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 77132fbef2..424e1ab1fe 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -247,7 +247,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 47fa8f3aa5..91ad9d20a7 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj @@ -54,7 +54,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 ab3d8ed64e..85321a5af7 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj @@ -176,7 +176,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj index e41b1ebf87..7520e748e0 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -180,7 +180,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj index c69f054d58..989b2bbf43 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -180,7 +180,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 d747df24f1..a73270a5f2 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 6a7e31f436..44cafd2abc 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 5d2acab5de..921cf4aa8d 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -219,7 +219,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj index 7db73bfeec..62c4b223dc 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -223,7 +223,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj index a4fe79124e..014cc64924 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -223,7 +223,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 4b27918228..f424f458dd 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -345,7 +345,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 367ae06d99..4022996806 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -343,7 +343,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 451b582a54..47a2203a82 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj index b3371350b9..d90bc55328 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj index 8aa20b3e7a..bc1f7af3e9 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 9e1444a488..b35e2c791b 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 5fdc3d27e3..5dfc6c2aab 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 cdea672620..951a35b59b 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj index 4e750e136c..595aa2f0dc 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj index 07e6630d2f..b9c5a8a617 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 ee88ca87a5..61becb6c38 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 b699740293..e3f776f1eb 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 b49bcf348b..e51c8329d7 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj @@ -176,7 +176,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj index 1eb3c6109a..4919fc9aa6 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -180,7 +180,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj index 05c7e3034b..8979dd2d36 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -180,7 +180,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 10ea23626f..5cf258c372 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 af4cd0c6fd..fa7a4ce2c4 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 39a78f96a7..0780b3925b 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj index 03ea1d3d8e..52fcda4358 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj index 2b231ea3ce..a8b740587c 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use 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 e8a73cd4dd..493184ebae 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 8f238c5aa7..16ea6aab7f 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" 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 a5d369acc9..4d65db8200 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj @@ -92,7 +92,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -134,7 +134,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -177,7 +177,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -219,7 +219,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj index abdfe15dac..894b03e736 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj index 0cb5074003..8f8c4176b6 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions) true MultiThreadedDLL true 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 1498f893b4..3076a21e68 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -247,7 +247,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -345,7 +345,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" 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 a08c5c3af3..1a4f05f5bf 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj @@ -54,7 +54,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -247,7 +247,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -343,7 +343,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" 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 c032c6b4f0..0c594cd067 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj @@ -182,7 +182,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -226,7 +226,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj index 198470dcd2..2f4bde2b81 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -186,7 +186,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -230,7 +230,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj index 6b10576990..b9f5f50b7d 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -186,7 +186,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -230,7 +230,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL 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 f8d02c3423..8f2cfcc4a3 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -152,7 +152,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" @@ -349,7 +349,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" 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 cf34d7810d..8d7411c747 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj @@ -250,7 +250,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" @@ -347,7 +347,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" diff --git a/samples/mfc/standard/Data/Motor-c.csfdb b/samples/mfc/standard/Data/Motor-c.csfdb deleted file mode 100755 index 908ea4de6d..0000000000 Binary files a/samples/mfc/standard/Data/Motor-c.csfdb and /dev/null differ diff --git a/samples/mfc/standard/Data/Motor-compound.csfdb b/samples/mfc/standard/Data/Motor-compound.csfdb deleted file mode 100755 index 93d7375ad6..0000000000 Binary files a/samples/mfc/standard/Data/Motor-compound.csfdb and /dev/null differ diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj index e5cc195e60..9613da3fdb 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj @@ -92,7 +92,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -135,7 +135,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -179,7 +179,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 91219f8484..0eb3c5ca27 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -96,7 +96,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -139,7 +139,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -183,7 +183,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -226,7 +226,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index d9f865e87c..2c6e02c613 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -96,7 +96,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -139,7 +139,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -183,7 +183,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -226,7 +226,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index d78405fec4..9bff5fa97b 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -152,7 +152,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -249,7 +249,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -348,7 +348,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj index 95e7509216..d195df8feb 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj @@ -54,7 +54,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -151,7 +151,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -249,7 +249,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -346,7 +346,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true"