X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env_Salome.bat;h=9de52650f137e89bb52f21993b9a3a8dbf6fc472;hb=752c9e02e6aa8ced24e9b53097cb42540d5e6a08;hp=9c4291781a7cbb94c423c41e36b77b7a59abb45e;hpb=24b5cecfd90858f5b8d92e4d00123acd5e5d5993;p=modules%2Fshaper.git

diff --git a/env_Salome.bat b/env_Salome.bat
index 9c4291781..9de52650f 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -20,7 +20,24 @@ 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%
+
+if "%PLANEGCS_ROOT_DIR%" == "" (
+  SET PLANEGCS_ROOT_DIR=%ROOT_DIR%\products\planegcs-0.16
+)
+SET PATH=%PLANEGCS_ROOT_DIR%\lib;%PATH%
+
+if "%EIGEN_ROOT_DIR%" == "" (
+  SET EIGEN_ROOT_DIR=%ROOT_DIR%\products\eigen-3.2.7
+)
+
+if "%BOOST_ROOT_DIR%" == "" (
+  if "SALOME_ROOT_DIR" == "" (
+    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+  ) else (
+    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+  )
 )
 
 cd %SALOME_ROOT_DIR%\WORK
@@ -57,24 +74,19 @@ cd %ROOT_DIR%
 @REM -------------------------
 
 @REM -------------------------
-@REM Create launch path
-rem @SET PATH=%LIBXML2_ROOT_DIR%\bin;%PATH%
-rem @SET PATH=%PDIR%\tbb\bin;%PATH%
-rem @SET PATH=%PDIR%\freeimage-3.15.4\bin;%PATH%
-rem @SET PATH=%PDIR%\ftgl-2.1.3\bin;%PATH%
-rem @SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
-rem @SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH%
-rem @SET PATH=%PDIR%\qwt-5.2.1\lib;%PATH%
-rem @SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
+@SET PYTHONHOME=%PYTHON_ROOT_DIR%
+@SET PYTHON_INCLUDE=%PYTHONHOME%\include
 @REM -------------------------
 
+
 @REM -------------------------
-@SET PYTHONHOME=%PYTHON_ROOT_DIR%
-@SET PYTHON_INCLUDE=%PYTHONHOME%\include
+@REM Some OCCT headers include FREETYPE headers
+@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11
 @REM -------------------------
 
 @SET PATH=%GEOM_ROOT_DIR%\lib\salome;%PATH%
 
+@SET _NO_DEBUG_HEAP=1
 
 IF "%ARCH%" == "Win64" (
   call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x64
@@ -88,8 +100,9 @@ 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 NEWGEOM_ROOT_DIR=%ROOT_DIR%\install
+@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 LightAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui
-@SET NewGeomResources=%ROOT_DIR%\install\resources
+@SET LightAppConfig=%%NEWGEOM_ROOT_DIR%\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui
+@SET NewGeomResources=%NEWGEOM_ROOT_DIR%\resources