X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc10_env.bat;h=e0f119ea80c12279da1c13a4deaea3c4c2c49c09;hb=2156bcfa18fd2ceeb4b427fc50604231775e3f3e;hp=cff0812ac22211ee37f597d4e42271e77a56a08d;hpb=b0782eb7d6c01174bd34cccd871078eb94259b5a;p=modules%2Fshaper.git

diff --git a/msvc10_env.bat b/msvc10_env.bat
index cff0812ac..e0f119ea8 100644
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -54,7 +54,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 
 @REM -------------------------
-@REM FREEIMAGE (Used by OCCT)
+@REM FREEIMAGE (Used by OCCT and Graphviz)
 @SET PATH=%PDIR%\freeimage-3.15.4\bin;%PATH%
 @REM -------------------------
 
@@ -118,12 +118,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%
@@ -143,20 +140,24 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 
 @REM -------------------------
-@REM SUIT
-@SET SUIT_DIR=%PDIR%\suit
-@SET PATH=%SUIT_DIR%\bin;%PATH%
+@REM PNG library (Used by GRAPHVIZ)
+@SET PATH=%PDIR%\libpng-1.5.10\bin;%PATH%
 @REM -------------------------
 
 
 @REM -------------------------
-if "%GUI_ROOT_DIR%" == "" (
-  @SET GUI_ROOT_DIR=%ROOT_DIR%\SALOME\GUI\DEBUG\GUI_INSTALL
-)
+@REM SUIT
+@SET SUIT_DIR=%PDIR%\suit
+@SET PATH=%SUIT_DIR%\bin;%PATH%
 @REM -------------------------
 
-
-@SET NewGeomResources=%ROOT_DIR%\install\resources
+@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)