Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / env_Salome.bat

diff --git a/env_Salome.bat b/env_Salome.bat
index 9c4291781a7cbb94c423c41e36b77b7a59abb45e..e7e3551a5b9e9a7a2705e18604c464ceef5fc73a 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -20,8 +20,8 @@ if "%SALOME_ROOT_DIR%" == "" (
 
 if "%SOLVESPACE_ROOT_DIR%" == "" (
   SET SOLVESPACE_ROOT_DIR=%ROOT_DIR%\products\solvespace-2.0
-  SET PATH=%SOLVESPACE_ROOT_DIR%\lib;"%PATH%"
 )
+SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
 
 cd %SALOME_ROOT_DIR%\WORK
 call set_env.bat %1
@@ -75,6 +75,7 @@ rem @SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
 
 @SET PATH=%GEOM_ROOT_DIR%\lib\salome;%PATH%
 
+@SET _NO_DEBUG_HEAP=1
 
 IF "%ARCH%" == "Win64" (
   call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x64
@@ -88,8 +89,8 @@ IF "%ARCH%" == "Win64" (
 )
 
 @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;%PYTHONPATH%
+@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 LightAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui
 @SET NewGeomResources=%ROOT_DIR%\install\resources