SQUIHS test for issue #474

[modules/shaper.git] / msvc10_env.bat

diff --git a/msvc10_env.bat b/msvc10_env.bat
index 30eb26a1ce43c331367bdac732ac4d1a1c57a1f0..5b9dc5708692283303ef95af0ae604fb85c55668 100644 (file)
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -26,7 +26,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM CASCADE
-@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.8.0
+@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.9.0
 @SET CASROOT=%CAS_ROOT_DIR%
 @REM -------------------------
 
@@ -65,7 +65,9 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM FREETYPE (Used by OCCT)
-@SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
+@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11
+@SET PATH=%FREETYPE_ROOT_DIR%\bin;%PATH%
+@REM -------------------------
 @REM -------------------------
 
 @REM -------------------------
@@ -153,11 +155,11 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM OPENPARTS
-@SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\swig;%ROOT_DIR%\install\plugins;%ROOT_DIR%\install\bin;%PATH%
-@SET PYTHONPATH=%ROOT_DIR%\install\swig;%ROOT_DIR%\install\plugins;%PYTHONPATH%
-@SET NewGeomResources=%ROOT_DIR%\install\resources
-@REM -------------------------
+@SET NEWGEOM_ROOT_DIR=%ROOT_DIR%\install
+@SET NEW_GEOM_CONFIG_FILE=%NEWGEOM_ROOT_DIR%\plugins
+@SET PATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\bin;%PATH%
+@SET PYTHONPATH=%NEWGEOM_ROOT_DIR%\swig;%NEWGEOM_ROOT_DIR%\plugins;%NEWGEOM_ROOT_DIR%\addons;%NEWGEOM_ROOT_DIR%\pythonAPI;%PYTHONPATH%
+@SET NewGeomResources=%NEWGEOM_ROOT_DIR%\resources
 
 rem -------- Visual Studio --------------------
 rem Detect Visual Studio (either commercial or Express edition)