X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2FMeshGems.bat;h=5e86cf15c2ed26b283ac765313991cc9969967c9;hb=b07bdf74780ecf760363bb867f5062023e43422c;hp=21fc9666a7522283499f353131a4012af9301e4e;hpb=e60e269abf9c215740115183c2f19752eddd9c87;p=tools%2Fsat_salome.git diff --git a/products/compil_scripts/MeshGems.bat b/products/compil_scripts/MeshGems.bat index 21fc966..5e86cf1 100755 --- a/products/compil_scripts/MeshGems.bat +++ b/products/compil_scripts/MeshGems.bat @@ -15,11 +15,10 @@ mkdir %BUILD_DIR% cd %SOURCE_DIR% -set SRC_FOLDER=Win7_64_VC14 - +set SRC_FOLDER_VC14=Win7_64_VC14 +set SRC_FOLDER_VC15=Win7_64_VC15 cd DISTENE\MeshGems-*\Products -echo SRC_FOLDER = %SRC_FOLDER% echo PRODUCT_INSTALL = %PRODUCT_INSTALL% rem ## Includes @@ -30,6 +29,12 @@ if NOT %ERRORLEVEL% == 0 ( ) rem ## Lib +set SRC_FOLDER=%SRC_FOLDER_VC15% +if exist "lib\%SRC_FOLDER_VC14%" ( + set SRC_FOLDER=%SRC_FOLDER_VC14% +) + +echo SRC_FOLDER = %SRC_FOLDER% echo. echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y