X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc9_env_Salome.bat;h=d09176f412b333e4111a5615599d013700a4fd22;hb=47d69c6e766821c1296c5147a6248ae49020c7dd;hp=15317ad207b274479b452c7f05ce26564c502559;hpb=6654a921211670c15a79a997ca666a174fe8a6f6;p=modules%2Fshaper.git

diff --git a/msvc9_env_Salome.bat b/msvc9_env_Salome.bat
index 15317ad20..d09176f41 100644
--- a/msvc9_env_Salome.bat
+++ b/msvc9_env_Salome.bat
@@ -18,9 +18,14 @@ if "%SALOME_ROOT_DIR%" == "" (
   set SALOME_ROOT_DIR=%ROOT_DIR%\SALOME
 )
 
-call "%SALOME_ROOT_DIR%\WORK\set_env.bat"
+if "%SOLVESPACE_ROOT_DIR%" == "" (
+  @SET SOLVESPACE_ROOT_DIR=%ROOT_DIR%\products\solvespace-2.0
+)
+
+call %SALOME_ROOT_DIR%\WORK\set_env.bat %1
 call "%PDIR%\env_compile.bat"
 
+
 @REM -------------------------
 @REM Python
 @SET PYTHON_LIB_DIR=%PYTHON_ROOT_DIR%\libs
@@ -58,8 +63,11 @@ call "%PDIR%\env_compile.bat"
 @SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
 @SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH%
 @SET PATH=%PDIR%\qwt-5.2.1\lib;%PATH%
+@SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
 @REM -------------------------
 
+
+
 IF "%ARCH%" == "Win64" (
   call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" x64
 ) ELSE (
@@ -72,6 +80,6 @@ IF "%ARCH%" == "Win64" (
 )
 
 @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\bin;%ROOT_DIR%\install\plugins;%PATH%
+@SET PATH=%PATH%;%ROOT_DIR%\install\bin;%ROOT_DIR%\install\plugins
 
 @SET LightAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui