X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=msvc10_env.bat;h=1d2233ce4347d693a6ed7525d8893254246317e8;hb=c8d61fbcebb393ff8dff2a005729776d4a1b3f59;hp=6b774f930deed9815a2e6dafe47eb80758e221ad;hpb=7cc3d9e6696b77a8fdf396cbd55370de3f3ebd9e;p=modules%2Fshaper.git diff --git a/msvc10_env.bat b/msvc10_env.bat index 6b774f930..1d2233ce4 100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@ -20,7 +20,7 @@ if "%PDIR%" == "" ( rem --------------- cmake 2.8.7 -------------- if "%CMAKEDIR%" == "" ( - set CMAKEDIR=%PDIR%\cmake-2.8.12.1 + set CMAKEDIR=%PDIR%\cmake-2.8.10.2 ) set PATH=%CMAKEDIR%\bin;%PATH% @@ -32,9 +32,8 @@ set PATH=%CMAKEDIR%\bin;%PATH% @REM ------------------------- @REM CASCADE -@SET PATH=%CASROOT%;%CASROOT%\win32\bind;%PATH% -@SET LIB=%CASROOT%\win32\libd;%LIB% -@set CSF_GraphicShr=%CASROOT%\win32\bind\TKOpenGl.dll +@SET PATH=%CASROOT%;%CASROOT%\win32\bin%OCC_LIB_PREFIX%;%PATH% +@SET LIB=%CASROOT%\win32\lib%OCC_LIB_PREFIX%;%LIB% @set CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT @set CSF_LANGUAGE=us @set MMGT_CLEAR=1 @@ -122,17 +121,26 @@ 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 ------------------------- -@SET PATH=D:\NewGEOM\build-eclipse\bin;%PATH% +@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% +@REM ------------------------- +if "%GUI_ROOT_DIR%" == "" ( + @SET GUI_ROOT_DIR=%ROOT_DIR%\SALOME\GUI\DEBUG\GUI_INSTALL +) +@REM ------------------------- + + rem -------- Visual Studio -------------------- rem Detect Visual Studio (either commercial or Express edition) if "%VS100COMNTOOLS%" == "" (