From: apn <apn@opencascade.com>
Date: Thu, 17 Aug 2017 13:17:20 +0000 (+0300)
Subject: 0029010: Launch custom.bat in samples before calling general environment
X-Git-Tag: V7_2_0~45
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=fe6c26dc50bd748c59161ddea55bcd62a5c21a0e;p=occt-copy.git

0029010: Launch custom.bat in samples before calling general environment

Replace calling custom.bat and general env.bat in samples.
---

diff --git a/samples/qt/FuncDemo/env.bat b/samples/qt/FuncDemo/env.bat
index e00ecf874d..d0450d73cd 100644
--- a/samples/qt/FuncDemo/env.bat
+++ b/samples/qt/FuncDemo/env.bat
@@ -1,8 +1,8 @@
 @echo off
 
-call "custom.bat" %1 %2 %3
-
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
+call "custom.bat" %1 %2 %3
+
 set "PATH=%QTDIR%/bin;%PATH%"
 set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
\ No newline at end of file
diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat
index 4ac6a0e3ff..90a5c2cebd 100755
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,9 +1,9 @@
 @echo off
 
-call "custom.bat" %1 %2 %3
-
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
+call "custom.bat" %1 %2 %3
+
 set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_IEResourcesDefaults=%RES_DIR%"
diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index 2cff47e14f..781e09ef67 100755
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,9 +1,9 @@
 @echo off
 
-call "custom.bat" %1 %2 %3
-
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
+call "custom.bat" %1 %2 %3
+
 set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_TutorialResourcesDefaults=%RES_DIR%"