X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc10_env.bat;h=d186a51994514ce69edb51b230c621e016bfa4dd;hb=4d6bb9de0e54f09a9bbacc94a058cb7cd437d535;hp=30eb26a1ce43c331367bdac732ac4d1a1c57a1f0;hpb=196da62758d6408bfb623bcdf32c76889f2d55bb;p=modules%2Fshaper.git

diff --git a/msvc10_env.bat b/msvc10_env.bat
index 30eb26a1c..d186a5199 100644
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -20,13 +20,13 @@ if "%PDIR%" == "" (
 
 rem --------------- cmake 2.8.7 --------------
 if "%CMAKEDIR%" == "" (
-  set CMAKEDIR=%PDIR%\cmake-2.8.10.2
+  set CMAKEDIR=%PDIR%\cmake-2.8.12.2
 )
 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.1
 @SET CASROOT=%CAS_ROOT_DIR%
 @REM -------------------------
 
@@ -55,7 +55,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM FREEIMAGE (Used by OCCT and Graphviz)
-@SET PATH=%PDIR%\freeimage-3.15.4\bin;%PATH%
+@SET PATH=%PDIR%\freeimage-3.16.0\dll;%PATH%
 @REM -------------------------
 
 @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 -------------------------
@@ -75,7 +77,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM TBB (Used by OCCT)
-@SET PATH=%PDIR%\tbb\bin;%PATH%
+@SET PATH=%PDIR%\tbb-4.2.4\bin;%PATH%
 @REM -------------------------
 
 @REM -------------------------
@@ -90,7 +92,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM PYTHON
-@SET PYTHONHOME=%PDIR%\python-2.7.3
+@SET PYTHONHOME=%PDIR%\python-2.7.10
 @SET PYTHON_INCLUDE=%PYTHONHOME%\include
 @SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH%
 @SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH%
@@ -121,6 +123,23 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @SET _NO_DEBUG_HEAP=1
 @REM -------------------------
 
+@REM -------------------------
+@SET PLANEGCS_ROOT_DIR=%PDIR%\planegcs-0.16
+@SET PATH=%PLANEGCS_ROOT_DIR%\lib;%PATH%
+@REM -------------------------
+
+@REM -------------------------
+@SET EIGEN_ROOT_DIR=%PDIR%\eigen-3.2.7
+@REM -------------------------
+
+@REM -------------------------
+@IF "%SALOME_ROOT_DIR%" == "" (
+@SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0
+) ELSE (
+@SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+)
+@REM -------------------------
+
 @REM -------------------------
 @REM PTHREAD
 @SET PATH=%PDIR%\pthreads-2.9.1\lib;%PATH%
@@ -153,11 +172,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)