Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of newgeom:newgeom
[modules/shaper.git]
/
msvc10_env.bat
diff --git
a/msvc10_env.bat
b/msvc10_env.bat
index 6b774f930deed9815a2e6dafe47eb80758e221ad..1d2233ce4347d693a6ed7525d8893254246317e8 100644
(file)
--- a/
msvc10_env.bat
+++ b/
msvc10_env.bat
@@
-20,7
+20,7
@@
if "%PDIR%" == "" (
rem --------------- cmake 2.8.7 --------------
if "%CMAKEDIR%" == "" (
rem --------------- cmake 2.8.7 --------------
if "%CMAKEDIR%" == "" (
- set CMAKEDIR=%PDIR%\cmake-2.8.1
2.1
+ set CMAKEDIR=%PDIR%\cmake-2.8.1
0.2
)
set PATH=%CMAKEDIR%\bin;%PATH%
)
set PATH=%CMAKEDIR%\bin;%PATH%
@@
-32,9
+32,8
@@
set PATH=%CMAKEDIR%\bin;%PATH%
@REM -------------------------
@REM CASCADE
@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
@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 -------------------------
@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 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%
@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%" == "" (
rem -------- Visual Studio --------------------
rem Detect Visual Studio (either commercial or Express edition)
if "%VS100COMNTOOLS%" == "" (