X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc10_env.bat;h=246307098222cbb07a247986d823e0948db44284;hb=777355f618fe676b63a81d51e04ab1037600e2dc;hp=f5707a410c41f4d60803f03574684e7a87e8799d;hpb=cef62927c901f5e3e44bfee25e81e1ed20aab91c;p=modules%2Fshaper.git

diff --git a/msvc10_env.bat b/msvc10_env.bat
index f5707a410..246307098 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 -------------------------
 
@@ -54,8 +54,8 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 
 @REM -------------------------
-@REM FREEIMAGE (Used by OCCT)
-@SET PATH=%PDIR%\freeimage-3.15.4\bin;%PATH%
+@REM FREEIMAGE (Used by OCCT and Graphviz)
+@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%
@@ -118,12 +120,9 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @SET SOLVESPACE_ROOT_DIR=%PDIR%\solvespace-2.0
 @SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
+@SET _NO_DEBUG_HEAP=1
 @REM -------------------------
 
-@SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\plugins;%ROOT_DIR%\install\bin;%PATH%
-@SET PYTHONPATH=%ROOT_DIR%\install\swig;%ROOT_DIR%\install\plugins;%PYTHONPATH%
-
 @REM -------------------------
 @REM PTHREAD
 @SET PATH=%PDIR%\pthreads-2.9.1\lib;%PATH%
@@ -136,20 +135,31 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 
 @REM -------------------------
-@REM SUIT
-@SET SUIT_DIR=%PDIR%\suit
-@SET PATH=%SUIT_DIR%\bin;%PATH%
+@REM GRAPHVIZ 
+@SET GRAPHVIZ_ROOT_DIR=%PDIR%\graphviz-2.38.0
+@SET GRAPHVIZHOME=%GRAPHVIZ_ROOT_DIR%
+@SET PATH=%GRAPHVIZ_ROOT_DIR%\bin;%PATH%
 @REM -------------------------
 
-
 @REM -------------------------
-if "%GUI_ROOT_DIR%" == "" (
-  @SET GUI_ROOT_DIR=%ROOT_DIR%\SALOME\GUI\DEBUG\GUI_INSTALL
-)
+@REM PNG library (Used by GRAPHVIZ)
+@SET PATH=%PDIR%\libpng-1.5.10\bin;%PATH%
 @REM -------------------------
 
 
-@SET NewGeomResources=%ROOT_DIR%\install\resources
+@REM -------------------------
+@REM SUIT
+@SET SUIT_DIR=%PDIR%\suit
+@SET PATH=%SUIT_DIR%\bin;%PATH%
+@REM -------------------------
+
+@REM -------------------------
+@REM OPENPARTS
+@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)