X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc10_env.bat;h=5b9dc5708692283303ef95af0ae604fb85c55668;hb=7e01af6cfeb76252b3fd062f6a2f35115994a422;hp=bac9fdbe3242fa3cc85e608338b4207084f9165f;hpb=15ffbe3dd90be499cad0b5461f74de884db6c611;p=modules%2Fshaper.git

diff --git a/msvc10_env.bat b/msvc10_env.bat
index bac9fdbe3..5b9dc5708 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.1
+@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.9.0
 @SET CASROOT=%CAS_ROOT_DIR%
 @REM -------------------------
 
@@ -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 -------------------------
 
@@ -65,7 +65,9 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM FREETYPE (Used by OCCT)
-@SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
+@SET FREETYPE_ROOT_DIR=%PDIR%\freetype-2.4.11
+@SET PATH=%FREETYPE_ROOT_DIR%\bin;%PATH%
+@REM -------------------------
 @REM -------------------------
 
 @REM -------------------------
@@ -81,7 +83,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @REM QT
 @SET QTDIR=%PDIR%\qt-4.8.4
-@ECHO -- Creating qt.conf... 
+@ECHO -- Creating qt.conf... in %QTDIR%
 @ECHO [Paths] > %QTDIR%/bin/qt.conf
 @ECHO Prefix = %QTDIR:\=/% >> %QTDIR%/bin/qt.conf
 @SET PATH=%QTDIR%\bin;%PATH%
@@ -92,7 +94,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM PYTHON
 @SET PYTHONHOME=%PDIR%\python-2.7.3
 @SET PYTHON_INCLUDE=%PYTHONHOME%\include
-@SET PATH=%PYTHONHOME%;%PATH%
+@SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH%
 @SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH%
 @SET PYTHONPATH=%PYTHONHOME%\DLLs;%PYTHONPATH%
 @SET PYTHON_VERSION=2.7
@@ -106,12 +108,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 -------------------------
@@ -119,35 +117,49 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @SET PATH=%PDIR%\swig-2.0.9\bin;%PATH%
 @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%
+@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;%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 DOXYGEN 
+@SET DOXYGEN_ROOT_DIR=%PDIR%\doxygen-1.8.3.1
+@SET PATH=%DOXYGEN_ROOT_DIR%\bin;%PATH%
 @REM -------------------------
 
+@REM -------------------------
+@REM GRAPHVIZ 
+@SET GRAPHVIZ_ROOT_DIR=%PDIR%\graphviz-2.38.0
+@SET GRAPHVIZHOME=%GRAPHVIZ_ROOT_DIR%
+@SET PATH=%GRAPHVIZ_ROOT_DIR%\bin;%PATH%
+@REM -------------------------
 
 @REM -------------------------
-if "%GUI_ROOT_DIR%" == "" (
-  @SET GUI_ROOT_DIR=%ROOT_DIR%\SALOME\GUI\DEBUG\GUI_INSTALL
-)
+@REM PNG library (Used by GRAPHVIZ)
+@SET PATH=%PDIR%\libpng-1.5.10\bin;%PATH%
 @REM -------------------------
 
 
-@SET NewGeomResources=%ROOT_DIR%\install\resources
+@REM -------------------------
+@REM SUIT
+@SET SUIT_DIR=%PDIR%\suit
+@SET PATH=%SUIT_DIR%\bin;%PATH%
+@REM -------------------------
+
+@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)