Adapt compilation on Windows

diff --git a/build_Salome_deb.bat b/build_Salome_deb.bat
index 3ab3aa812ee4f6297d3c7915a83625837b12fdd2..a65baa442e0369a644a66f8c65a4a0e23a1dd514 100644 (file)
--- a/build_Salome_deb.bat
+++ b/build_Salome_deb.bat
@@ -3,11 +3,11 @@
 REM Find absolute path to ROOT_DIR 
 @SET PARENT_DIR=%~dp0..
 @SET ROOT_DIR=
-pushd %PARENT_DIR%\..
+pushd %PARENT_DIR%
 @SET ROOT_DIR=%CD%
 popd
 
-@SET SRC_DIR=%ROOT_DIR%\sources\shaper
+@SET SRC_DIR=%ROOT_DIR%\sources
 @SET OCC_LIB_PREFIX=d
 
 call %SRC_DIR%\env_Salome.bat d

diff --git a/env_Salome.bat b/env_Salome.bat
index 19981f6f0f0e4093eb013b7e5c04c3d18314e4b4..57d9e32f6d3ad673c0ee8cf54677fee9d9556586 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -1,7 +1,5 @@
 @echo off
 
-IF NOT EXIST "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" GOTO ERROR1
-
 @REM Load local settings from file localenv.bat that should be located in the root directory
 if "%ROOT_DIR%" == "" (
   set ROOT_DIR=%~dp0..
@@ -87,16 +85,19 @@ cd /d %ROOT_DIR%
 
 @SET _NO_DEBUG_HEAP=1
 
-IF "%ARCH%" == "Win64" (
-  call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
-) ELSE (
-  IF "%ARCH%" == "Win32" (
-    call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
-  ) ELSE (
-    echo Wrong architecture is used. Win32 or Win64 architecture is allowed only.
-    echo Refer to the set_env.bat script.
-  )
+if "%VS140COMNTOOLS%" == "" (
+    echo Could not find MS Visual Studio: variable VS140COMNTOOLS is not defined!
+    exit 1
+) else if exist "%VS140COMNTOOLS%\..\IDE\devenv.exe" (
+    set MSVC_EXE="%VS140COMNTOOLS%\..\IDE\devenv.exe"
+) else if exist "%VS140COMNTOOLS%\..\IDE\VCExpress.exe" (
+    set MSVC_EXE="%VS140COMNTOOLS%\..\IDE\VCExpress.exe"
+) else (
+    echo "Could not find MS Visual Studio in %VS140COMNTOOLS%\..\IDE"
+    echo Check environment variable VS140COMNTOOLS!
+    exit 1
 )
+call "%VS140COMNTOOLS%..\Tools\vsvars32.bat"
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%

diff --git a/salomeRun_deb.bat b/salomeRun_deb.bat
index 6622e329570b8c04cdca3ca186ef04fbf58637b6..14b69a6bae69db906e26ff02fb6585e92c742ced 100644 (file)
--- a/salomeRun_deb.bat
+++ b/salomeRun_deb.bat
@@ -3,7 +3,7 @@
 REM Find absolute path to ROOT_DIR
 @SET PARENT_DIR=%~dp0..
 @SET ROOT_DIR=
-pushd %PARENT_DIR%\..
+pushd %PARENT_DIR%
 @SET ROOT_DIR=%CD%
 popd