X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc10_env.bat;h=fd95eec285a538e75f5617ef4b89b038abfe5b91;hb=e827d8402c186771954bffcf66a8fd3e5aafde32;hp=ac0173ad4150e08ad1089b103ba366cbe1a7195f;hpb=c6fd86525e1703a48b3d317b738d9ec8e41f998f;p=modules%2Fshaper.git

diff --git a/msvc10_env.bat b/msvc10_env.bat
index ac0173ad4..fd95eec28 100644
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -26,7 +26,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM CASCADE
-@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.7.0
+@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.7.1
 @SET CASROOT=%CAS_ROOT_DIR%
 @REM -------------------------
 
@@ -91,10 +91,8 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @REM PYTHON
 @SET PYTHONHOME=%PDIR%\python-2.7.3
-@SET PYTHON_LIB_DIR=%PYTHONHOME%\libs
-@SET PYTHON_INC_DIR=%PYTHONHOME%\include
-@SET PATH=%PYTHON_LIB_DIR%;%PATH%
-@SET PATH=%PYTHONHOME%;%PATH%
+@SET PYTHON_INCLUDE=%PYTHONHOME%\include
+@SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH%
 @SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH%
 @SET PYTHONPATH=%PYTHONHOME%\DLLs;%PYTHONPATH%
 @SET PYTHON_VERSION=2.7
@@ -108,12 +106,8 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @REM LIBXML2
 @SET LIBXML2_ROOT_DIR=%PDIR%\libxml2-2.9.0
-@REM DO NOT rename following 3 variables, 
-@REM they are required by CMake "find(Libxml2)" procedure
-@SET LIBXML2_INCLUDE_DIR=%LIBXML2_ROOT_DIR%\include\libxml2
-@SET LIBXML2_LIB_DIR=%LIBXML2_ROOT_DIR%\lib
-@SET LIBXML2_BIN_DIR=%LIBXML2_ROOT_DIR%\bin
-@SET PATH=%LIBXML2_BIN_DIR%;%LIBXML2_LIB_DIR%;%PATH%
+@SET PATH=%LIBXML2_ROOT_DIR%\lib;%PATH%
+@SET PATH=%LIBXML2_ROOT_DIR%\bin;%PATH%
 @REM -------------------------
 
 @REM -------------------------
@@ -121,14 +115,41 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @SET PATH=%PDIR%\swig-2.0.9\bin;%PATH%
 @REM -------------------------
 
-@REM -------------------------
 @REM BOOST
 @SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0
 @SET PATH=%BOOST_ROOT_DIR%\lib;%PATH%
 @REM -------------------------
 
+@REM -------------------------
+@SET SOLVESPACE_ROOT_DIR=%PDIR%\solvespace-2.0
+@SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
+@REM -------------------------
+
 @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\plugins;%PATH%
+@SET PATH=%ROOT_DIR%\install\plugins;%ROOT_DIR%\install\bin;%PATH%
+@SET PYTHONPATH=%ROOT_DIR%\install\swig;%PYTHONPATH%
+
+@REM -------------------------
+@REM PTHREAD
+@SET PATH=%PDIR%\pthreads-2.9.1\lib;%PATH%
+@REM -------------------------
+
+
+@REM -------------------------
+@REM SUIT
+@SET SUIT_DIR=%PDIR%\suit
+@SET PATH=%SUIT_DIR%\bin;%PATH%
+@REM -------------------------
+
+
+@REM -------------------------
+if "%GUI_ROOT_DIR%" == "" (
+  @SET GUI_ROOT_DIR=%ROOT_DIR%\SALOME\GUI\DEBUG\GUI_INSTALL
+)
+@REM -------------------------
+
+
+@SET NewGeomResources=%ROOT_DIR%\install\resources
 
 rem -------- Visual Studio --------------------
 rem Detect Visual Studio (either commercial or Express edition)