From 06562706d2e3fc7416d9191d36e67d02247ee119 Mon Sep 17 00:00:00 2001 From: ski Date: Thu, 8 Oct 2015 15:09:38 +0300 Subject: [PATCH] 0026741: Problem with building samples and demo Scripts and project files were changed to use corrent environment. --- samples/CSharp/OCCTProxy/OCCTProxy.vcproj | 16 ++++---- samples/CSharp/OCCTProxy/OCCTProxy.vcxproj | 16 ++++---- .../CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj | 16 ++++---- .../OCCTProxy_D3D/OCCTProxy_D3D.vcxproj | 16 ++++---- samples/CSharp/msvc.bat | 41 ++++++++++++++++--- samples/CSharp/msvc_D3D.bat | 37 +++++++++++++++-- .../01_Geometry/adm/win/vc10/Geometry.vcxproj | 16 ++++---- .../01_Geometry/adm/win/vc11/Geometry.vcxproj | 16 ++++---- .../01_Geometry/adm/win/vc12/Geometry.vcxproj | 16 ++++---- .../01_Geometry/adm/win/vc8/Geometry.vcproj | 16 ++++---- .../01_Geometry/adm/win/vc9/Geometry.vcproj | 16 ++++---- .../02_Modeling/adm/win/vc10/Modeling.vcxproj | 16 ++++---- .../02_Modeling/adm/win/vc11/Modeling.vcxproj | 16 ++++---- .../02_Modeling/adm/win/vc12/Modeling.vcxproj | 16 ++++---- .../02_Modeling/adm/win/vc8/Modeling.vcproj | 16 ++++---- .../02_Modeling/adm/win/vc9/Modeling.vcproj | 16 ++++---- .../03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj | 16 ++++---- .../03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj | 16 ++++---- .../03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj | 16 ++++---- .../03_Viewer2d/adm/win/vc8/Viewer2d.vcproj | 16 ++++---- .../03_Viewer2d/adm/win/vc9/Viewer2d.vcproj | 16 ++++---- .../04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj | 16 ++++---- .../04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj | 16 ++++---- .../04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj | 16 ++++---- .../04_Viewer3d/adm/win/vc8/Viewer3d.vcproj | 16 ++++---- .../04_Viewer3d/adm/win/vc9/Viewer3d.vcproj | 16 ++++---- .../adm/win/vc10/ImportExport.vcxproj | 16 ++++---- .../adm/win/vc11/ImportExport.vcxproj | 16 ++++---- .../adm/win/vc12/ImportExport.vcxproj | 16 ++++---- .../adm/win/vc8/ImportExport.vcproj | 16 ++++---- .../adm/win/vc9/ImportExport.vcproj | 16 ++++---- .../06_Ocaf/adm/win/vc10/Ocaf.vcxproj | 16 ++++---- .../06_Ocaf/adm/win/vc11/Ocaf.vcxproj | 16 ++++---- .../06_Ocaf/adm/win/vc12/Ocaf.vcxproj | 16 ++++---- .../standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj | 16 ++++---- .../standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj | 16 ++++---- .../adm/win/vc10/Triangulation.vcxproj | 16 ++++---- .../adm/win/vc11/Triangulation.vcxproj | 16 ++++---- .../adm/win/vc12/Triangulation.vcxproj | 16 ++++---- .../adm/win/vc8/Triangulation.vcproj | 16 ++++---- .../adm/win/vc9/Triangulation.vcproj | 16 ++++---- .../standard/08_HLR/adm/win/vc10/HLR.vcxproj | 16 ++++---- .../standard/08_HLR/adm/win/vc11/HLR.vcxproj | 16 ++++---- .../standard/08_HLR/adm/win/vc12/HLR.vcxproj | 16 ++++---- .../standard/08_HLR/adm/win/vc8/HLR.vcproj | 16 ++++---- .../standard/08_HLR/adm/win/vc9/HLR.vcproj | 16 ++++---- .../adm/win/vc10/Animation.vcxproj | 16 ++++---- .../adm/win/vc11/Animation.vcxproj | 16 ++++---- .../adm/win/vc12/Animation.vcxproj | 16 ++++---- .../09_Animation/adm/win/vc8/Animation.vcproj | 16 ++++---- .../09_Animation/adm/win/vc9/Animation.vcproj | 16 ++++---- .../10_Convert/adm/win/vc10/Convert.vcxproj | 16 ++++---- .../10_Convert/adm/win/vc11/Convert.vcxproj | 16 ++++---- .../10_Convert/adm/win/vc12/Convert.vcxproj | 16 ++++---- .../10_Convert/adm/win/vc8/Convert.vcproj | 16 ++++---- .../10_Convert/adm/win/vc9/Convert.vcproj | 16 ++++---- .../mfcsample/adm/win/vc10/mfcsample.vcxproj | 16 ++++---- .../mfcsample/adm/win/vc11/mfcsample.vcxproj | 16 ++++---- .../mfcsample/adm/win/vc12/mfcsample.vcxproj | 16 ++++---- .../mfcsample/adm/win/vc8/mfcsample.vcproj | 16 ++++---- .../mfcsample/adm/win/vc9/mfcsample.vcproj | 16 ++++---- samples/mfc/standard/msvc.bat | 39 ++++++++++++++++-- 62 files changed, 576 insertions(+), 485 deletions(-) diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.vcproj b/samples/CSharp/OCCTProxy/OCCTProxy.vcproj index eefb3bbf1e..49075d5a95 100644 --- a/samples/CSharp/OCCTProxy/OCCTProxy.vcproj +++ b/samples/CSharp/OCCTProxy/OCCTProxy.vcproj @@ -46,7 +46,7 @@ Disabled - ..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) WNT;%(PreprocessorDefinitions) false Default @@ -94,7 +94,7 @@ $(OutDir)OCCTProxy.dll - $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/$(VCVER)/libd;%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy.pdb @@ -112,7 +112,7 @@ Disabled - ..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) WNT;%(PreprocessorDefinitions) false Default @@ -124,7 +124,7 @@ $(OutDir)OCCTProxy.dll - $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy.pdb @@ -138,7 +138,7 @@ - ..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) WNT;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,7 +148,7 @@ $(OutDir)OCCTProxy.dll - $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories) true Windows true @@ -165,7 +165,7 @@ X64 - ..\OCC\;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) WNT;%(PreprocessorDefinitions) MultiThreadedDLL @@ -175,7 +175,7 @@ $(OutDir)OCCTProxy.dll - $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories) true Windows true diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj index c4dcc5ebeb..e639973f75 100644 --- a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj +++ b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj @@ -46,7 +46,7 @@ Disabled - ..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) WNT;_DEBUG;%(PreprocessorDefinitions) false Default @@ -95,7 +95,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CSF_OPT_LIB32D);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) + $(CASROOT)/win32/$(VCVER)/libd;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy_D3D.pdb @@ -114,7 +114,7 @@ Disabled - ..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) WNT;_DEBUG;%(PreprocessorDefinitions) false Default @@ -126,7 +126,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy_D3D.pdb @@ -140,7 +140,7 @@ - ..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) WNT;%(PreprocessorDefinitions) MultiThreadedDLL @@ -150,7 +150,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories) true Windows true @@ -167,7 +167,7 @@ X64 - ..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) WNT;%(PreprocessorDefinitions) MultiThreadedDLL @@ -177,7 +177,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories) true Windows true diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat index 01b2c18e5e..902b3fa974 100644 --- a/samples/CSharp/msvc.bat +++ b/samples/CSharp/msvc.bat @@ -1,7 +1,38 @@ -call "%~dp0..\..\env.bat" %1 %2 %3 +@echo off -if ["%CASDEB%"] == [""] ( - call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release %~dp0\CSharp.sln +rem Setup environment +call "%~dp0../../env.bat" %1 %2 %3 + +rem Define path to project file +set "PRJFILE=%~dp0\CSharp.sln" + +set "VisualStudioExpressName=VCExpress" + +if "%VCVER%" == "vc8" ( + set "DevEnvDir=%VS80COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc9" ( + set "DevEnvDir=%VS90COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc10" ( + set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc11" ( + set "DevEnvDir=%VS110COMNTOOLS%..\IDE" + rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop" + rem and has a new name for executable - WDExpress + set "VisualStudioExpressName=WDExpress" +) else if "%VCVER%" == "vc12" ( + set "DevEnvDir=%VS120COMNTOOLS%..\IDE" + set "VisualStudioExpressName=WDExpress" +) else ( + echo Error: wrong VS identifier + exit /B +) + +rem Launch Visual Studio - either professional (devenv) or Express, as available +if exist "%DevEnvDir%\devenv.exe" ( + start "%DevEnvDir%\devenv.exe" "%PRJFILE%" +) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( + start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( - call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug %~dp0\CSharp.sln -) \ No newline at end of file + echo Error: Could not find MS Visual Studio ^(%VCVER%^) + echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^) +) diff --git a/samples/CSharp/msvc_D3D.bat b/samples/CSharp/msvc_D3D.bat index 96d6a2cd72..d9500ac766 100644 --- a/samples/CSharp/msvc_D3D.bat +++ b/samples/CSharp/msvc_D3D.bat @@ -1,5 +1,6 @@ @echo off +rem Setup environment call "%~dp0..\..\env.bat" %1 %2 %3 if NOT DEFINED DXSDK_DIR ( @@ -13,8 +14,36 @@ if NOT DEFINED DXSDK_DIR ( ) ) -if ["%CASDEB%"] == [""] ( - call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release %~dp0\CSharp_D3D.sln +rem Define path to project file +set "PRJFILE=%~dp0\CSharp_D3D.sln" + +set "VisualStudioExpressName=VCExpress" + +if "%VCVER%" == "vc8" ( + set "DevEnvDir=%VS80COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc9" ( + set "DevEnvDir=%VS90COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc10" ( + set "DevEnvDir=%VS100COMNTOOLS%..\IDE" +) else if "%VCVER%" == "vc11" ( + set "DevEnvDir=%VS110COMNTOOLS%..\IDE" + rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop" + rem and has a new name for executable - WDExpress + set "VisualStudioExpressName=WDExpress" +) else if "%VCVER%" == "vc12" ( + set "DevEnvDir=%VS120COMNTOOLS%..\IDE" + set "VisualStudioExpressName=WDExpress" +) else ( + echo Error: wrong VS identifier + exit /B +) + +rem Launch Visual Studio - either professional (devenv) or Express, as available +if exist "%DevEnvDir%\devenv.exe" ( + start "%DevEnvDir%\devenv.exe" "%PRJFILE%" +) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe" ( + start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%" ) else ( - call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug %~dp0\CSharp_D3D.sln -) \ No newline at end of file + echo Error: Could not find MS Visual Studio ^(%VCVER%^) + echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^) +) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj index 29764d769a..4765c38b8a 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj @@ -92,7 +92,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Geometry.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win32\vc10\bin/Geometry.pdb Windows @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -158,7 +158,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Geometry.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win64\vc10\bin/Geometry.pdb Windows @@ -177,7 +177,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -201,7 +201,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Geometry.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win32\vc10\bind/Geometry.pdb @@ -221,7 +221,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -245,7 +245,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc10\bind/Geometry.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win64\vc10\bind/Geometry.pdb 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 2d35067710..e1f3079ef0 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Geometry.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win32\vc11\bin/Geometry.pdb Windows @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -162,7 +162,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Geometry.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win64\vc11\bin/Geometry.pdb Windows @@ -181,7 +181,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,7 +205,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Geometry.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win32\vc11\bind/Geometry.pdb @@ -225,7 +225,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -249,7 +249,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc11\bind/Geometry.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win64\vc11\bind/Geometry.pdb 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 874657c143..08a1744832 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Geometry.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win32\vc12\bin/Geometry.pdb Windows @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -162,7 +162,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Geometry.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win64\vc12\bin/Geometry.pdb Windows @@ -181,7 +181,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,7 +205,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Geometry.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win32\vc12\bind/Geometry.pdb @@ -225,7 +225,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -249,7 +249,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc12\bind/Geometry.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win64\vc12\bind/Geometry.pdb 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 edd961666d..5d7fd578f0 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)" + AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Geometry.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="../../../..\win32\vc8\bin/Geometry.pdb" SubSystem="2" @@ -150,7 +150,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Modeling.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Modeling.pdb Windows @@ -133,7 +133,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -156,7 +156,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Modeling.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Modeling.pdb Windows @@ -176,7 +176,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -199,7 +199,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Modeling.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Modeling.pdb Windows MachineX86 @@ -218,7 +218,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -241,7 +241,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Modeling.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Modeling.pdb Windows MachineX64 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 1dc06df0f9..8281769ee4 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Modeling.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Modeling.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Modeling.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Modeling.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Modeling.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Modeling.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -245,7 +245,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Modeling.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Modeling.pdb Windows MachineX64 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 103b0ae10e..846b40cd37 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Modeling.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Modeling.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Modeling.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Modeling.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Modeling.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Modeling.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -245,7 +245,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Modeling.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Modeling.pdb Windows MachineX64 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 6e7b8d46ab..77132fbef2 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -52,7 +52,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Viewer2d.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Viewer2d.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Viewer2d.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Viewer2d.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Viewer2d.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Viewer2d.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Viewer2d.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Viewer2d.pdb Windows 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 cfe71294ab..e41b1ebf87 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Viewer2d.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Viewer2d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Viewer2d.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Viewer2d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Viewer2d.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Viewer2d.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Viewer2d.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Viewer2d.pdb Windows 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 0021b43fb4..c69f054d58 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Viewer2d.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Viewer2d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Viewer2d.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Viewer2d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Viewer2d.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Viewer2d.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Viewer2d.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Viewer2d.pdb Windows 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 b30e30c6ee..d747df24f1 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)" + AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Viewer2d.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer2d.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Viewer3d.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Viewer3d.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Viewer3d.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Viewer3d.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -199,7 +199,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Viewer3d.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Viewer3d.pdb Windows @@ -218,7 +218,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -242,7 +242,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Viewer3d.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Viewer3d.pdb Windows 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 84ec7499bd..7db73bfeec 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Viewer3d.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Viewer3d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Viewer3d.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Viewer3d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -203,7 +203,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Viewer3d.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Viewer3d.pdb Windows @@ -222,7 +222,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -246,7 +246,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Viewer3d.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Viewer3d.pdb Windows 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 70b9abcb8e..a4fe79124e 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Viewer3d.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Viewer3d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Viewer3d.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Viewer3d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -203,7 +203,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Viewer3d.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Viewer3d.pdb Windows @@ -222,7 +222,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -246,7 +246,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Viewer3d.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Viewer3d.pdb Windows 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 e5d68910ef..4b27918228 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)" + AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Viewer3d.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer3d.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/ImportExport.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/ImportExport.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/ImportExport.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/ImportExport.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/ImportExport.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/ImportExport.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/ImportExport.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/ImportExport.pdb Windows 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 e500171496..b3371350b9 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/ImportExport.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/ImportExport.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/ImportExport.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/ImportExport.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/ImportExport.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/ImportExport.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/ImportExport.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/ImportExport.pdb Windows 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 3f80bb1bf4..8aa20b3e7a 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/ImportExport.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/ImportExport.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/ImportExport.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/ImportExport.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/ImportExport.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/ImportExport.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/ImportExport.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/ImportExport.pdb Windows 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 4d93eddd53..9e1444a488 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)" + AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../../win32\vc8\bin/ImportExport.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ProgramDatabaseFile="../../../../win32\vc8\bin/ImportExport.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Ocaf.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Ocaf.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Ocaf.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Ocaf.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Ocaf.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Ocaf.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Ocaf.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Ocaf.pdb Windows 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 45b6f73787..4e750e136c 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Ocaf.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Ocaf.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Ocaf.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Ocaf.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Ocaf.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Ocaf.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Ocaf.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Ocaf.pdb Windows 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 fa730192d2..07e6630d2f 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Ocaf.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Ocaf.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Ocaf.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Ocaf.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Ocaf.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Ocaf.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Ocaf.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Ocaf.pdb Windows 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 533e4e5292..ee88ca87a5 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc" + AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Ocaf.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ProgramDatabaseFile="../../../..\win32\vc8\bin/Ocaf.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Triangulation.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Triangulation.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Triangulation.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Triangulation.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Triangulation.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Triangulation.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Triangulation.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Triangulation.pdb Windows 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 d1127963b0..1eb3c6109a 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Triangulation.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Triangulation.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Triangulation.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Triangulation.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Triangulation.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Triangulation.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Triangulation.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Triangulation.pdb Windows 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 4a31031cac..05c7e3034b 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Triangulation.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Triangulation.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Triangulation.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Triangulation.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Triangulation.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Triangulation.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.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;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Triangulation.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Triangulation.pdb Windows 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 a70a8897a7..10ea23626f 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src" + AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Triangulation.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ProgramDatabaseFile="../../../..\win32\vc8\bin/Triangulation.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/HLR.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/HLR.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/HLR.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/HLR.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/HLR.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/HLR.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/HLR.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/HLR.pdb Windows 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 403c4f5d9c..03ea1d3d8e 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/HLR.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/HLR.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/HLR.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/HLR.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/HLR.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/HLR.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/HLR.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/HLR.pdb Windows 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 3d2802a908..2b231ea3ce 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/HLR.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/HLR.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/HLR.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/HLR.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/HLR.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/HLR.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/HLR.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/HLR.pdb Windows 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 393a6a4f0d..e8a73cd4dd 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" + AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/HLR.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ProgramDatabaseFile="../../../..\win32\vc8\bin/HLR.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Animation.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Animation.pdb Windows @@ -133,7 +133,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -156,7 +156,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Animation.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Animation.pdb Windows @@ -176,7 +176,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -199,7 +199,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Animation.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Animation.pdb Windows MachineX86 @@ -218,7 +218,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -242,7 +242,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Animation.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Animation.pdb Windows MachineX64 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 3f4329d8da..abdfe15dac 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Animation.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Animation.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Animation.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Animation.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Animation.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Animation.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -246,7 +246,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Animation.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Animation.pdb Windows MachineX64 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 36412f9720..0cb5074003 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Animation.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Animation.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Animation.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Animation.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Animation.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Animation.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -246,7 +246,7 @@ TKBRep.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;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Animation.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Animation.pdb Windows MachineX64 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 b3e6b1ce3c..1498f893b4 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -52,7 +52,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -116,7 +116,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Convert.exe true - ..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) .\win32\obj\$(TargetFileName).intermediate.manifest ../../../../win32\vc10\bin/Convert.pdb Windows @@ -137,7 +137,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Convert.exe true - ..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) .\win64\obj\$(TargetFileName).intermediate.manifest ../../../../win64\vc10\bin/Convert.pdb Windows @@ -181,7 +181,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,7 +205,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Convert.exe true - ..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) .\win32\objd\$(TargetFileName).intermediate.manifest true ../../../../win32\vc10\bind/Convert.pdb @@ -225,7 +225,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -249,7 +249,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Convert.exe true - ..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) .\win64\objd\$(TargetFileName).intermediate.manifest true ../../../../win64\vc10\bind/Convert.pdb 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 94f7c9cfe7..198470dcd2 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -120,7 +120,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Convert.exe true - ..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) .\win32\obj\$(TargetFileName).intermediate.manifest ../../../../win32\vc11\bin/Convert.pdb Windows @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -165,7 +165,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Convert.exe true - ..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) .\win64\obj\$(TargetFileName).intermediate.manifest ../../../../win64\vc11\bin/Convert.pdb Windows @@ -185,7 +185,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -209,7 +209,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Convert.exe true - ..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) .\win32\objd\$(TargetFileName).intermediate.manifest true ../../../../win32\vc11\bind/Convert.pdb @@ -229,7 +229,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -253,7 +253,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Convert.exe true - ..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) .\win64\objd\$(TargetFileName).intermediate.manifest true ../../../../win64\vc11\bind/Convert.pdb 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 9ec3269170..6b10576990 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -120,7 +120,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Convert.exe true - ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) .\win32\obj\$(TargetFileName).intermediate.manifest ../../../../win32\vc12\bin/Convert.pdb Windows @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -165,7 +165,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Convert.exe true - ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) .\win64\obj\$(TargetFileName).intermediate.manifest ../../../../win64\vc12\bin/Convert.pdb Windows @@ -185,7 +185,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -209,7 +209,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Convert.exe true - ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) .\win32\objd\$(TargetFileName).intermediate.manifest true ../../../../win32\vc12\bind/Convert.pdb @@ -229,7 +229,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -253,7 +253,7 @@ FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Convert.exe true - ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) .\win64\objd\$(TargetFileName).intermediate.manifest true ../../../../win64\vc12\bind/Convert.pdb 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 0b8b49ce38..f8d02c3423 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common" + AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Convert.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" ManifestFile=".\win32\obj\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="../../../..\win32\vc8\bin/Convert.pdb" SubSystem="2" @@ -151,7 +151,7 @@ Disabled - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ 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;%(AdditionalDependencies) ../../../../win32\vc10\bind/mfcsample.dll true - $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/mfcsample.pdb Windows @@ -134,7 +134,7 @@ Disabled - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -157,7 +157,7 @@ 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;%(AdditionalDependencies) ../../../../win64\vc10\bind/mfcsample.dll true - $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/mfcsample.pdb Windows @@ -178,7 +178,7 @@ MaxSpeed OnlyExplicitInline - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -201,7 +201,7 @@ 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;%(AdditionalDependencies) ../../../../win32\vc10\bin/mfcsample.dll true - $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/mfcsample.pdb Windows ../../../../win32\vc10\lib/mfcsample.lib @@ -221,7 +221,7 @@ MaxSpeed OnlyExplicitInline - $(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -245,7 +245,7 @@ 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;%(AdditionalDependencies) ../../../../win64\vc10\bin/mfcsample.dll true - $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/mfcsample.pdb Windows ../../../../win64\vc10\lib/mfcsample.lib diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 052d7e5664..91219f8484 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -95,7 +95,7 @@ Disabled - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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;%(AdditionalDependencies) ../../../../win32\vc11\bind/mfcsample.dll true - $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/mfcsample.pdb Windows @@ -138,7 +138,7 @@ Disabled - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -161,7 +161,7 @@ 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;%(AdditionalDependencies) ../../../../win64\vc11\bind/mfcsample.dll true - $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/mfcsample.pdb Windows @@ -182,7 +182,7 @@ MaxSpeed OnlyExplicitInline - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ 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;%(AdditionalDependencies) ../../../../win32\vc11\bin/mfcsample.dll true - $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/mfcsample.pdb Windows ../../../../win32\vc11\lib/mfcsample.lib @@ -225,7 +225,7 @@ MaxSpeed OnlyExplicitInline - $(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -249,7 +249,7 @@ 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;%(AdditionalDependencies) ../../../../win64\vc11\bin/mfcsample.dll true - $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/mfcsample.pdb Windows ../../../../win64\vc11\lib/mfcsample.lib diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index 640653263c..d9f865e87c 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -95,7 +95,7 @@ Disabled - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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;%(AdditionalDependencies) ../../../../win32\vc12\bind/mfcsample.dll true - $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/mfcsample.pdb Windows @@ -138,7 +138,7 @@ Disabled - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -161,7 +161,7 @@ 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;%(AdditionalDependencies) ../../../../win64\vc12\bind/mfcsample.dll true - $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/mfcsample.pdb Windows @@ -182,7 +182,7 @@ MaxSpeed OnlyExplicitInline - $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ 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;%(AdditionalDependencies) ../../../../win32\vc12\bin/mfcsample.dll true - $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + $(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/mfcsample.pdb Windows ../../../../win32\vc12\lib/mfcsample.lib @@ -225,7 +225,7 @@ MaxSpeed OnlyExplicitInline - $(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -249,7 +249,7 @@ 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;%(AdditionalDependencies) ../../../../win64\vc12\bin/mfcsample.dll true - $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + $(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/mfcsample.pdb Windows ../../../../win64\vc12\lib/mfcsample.lib diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index b1575ea3bb..d78405fec4 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -52,7 +52,7 @@