Update of environment files of qt samples for compilation in batch mode.

diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat
index 69284cc0daed1431ffb580f6d039256a745077c6..3fa44b63199214e37a07e39f552fd9370509a0f3 100755 (executable)
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,3 +1,5 @@
+call "%~dp0..\..\..\env.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/IESample/generation-vc-projects.bat b/samples/qt/IESample/generation-vc-projects.bat
index b22d9295e67199ca68e786983c09164a131c0518..7694e23ad9352e0eb87919d5a38af0f128ac44f1 100644 (file)
--- a/samples/qt/IESample/generation-vc-projects.bat
+++ b/samples/qt/IESample/generation-vc-projects.bat
@@ -5,8 +5,7 @@ REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
 REM third argument specifies Debug or Release mode
 
-call "%~dp0..\..\..\env.bat" %1 %2 %3
-call "%~dp0env.bat"
+call "%~dp0env.bat" %1 %2 %3
 
 if not "%1" == "" (
     if /I "%1" == "vc8" (

diff --git a/samples/qt/IESample/msvc.bat b/samples/qt/IESample/msvc.bat
index 4aa44bd2f6de17d9dfb3bd2d431ce05df8ff13b9..eac8f9fe508b44829079bfa5fef846fa9da6dfea 100644 (file)
--- a/samples/qt/IESample/msvc.bat
+++ b/samples/qt/IESample/msvc.bat
@@ -1,5 +1,4 @@
-call "%~dp0..\..\..\env.bat" %1 %2 %3
-call "%~dp0env.bat"
+call "%~dp0env.bat" %1 %2 %3
 
 if ["%CASDEB%"] == [""] (
   call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0IESample-%VCVER%.sln"

diff --git a/samples/qt/IESample/run.bat b/samples/qt/IESample/run.bat
index 14e0592a0bc26be1aca9d3495c74f87faacc47b7..0c1b69fd263b53d652a96fa64d6f7c1b79c306cf 100644 (file)
--- a/samples/qt/IESample/run.bat
+++ b/samples/qt/IESample/run.bat
@@ -1,5 +1,4 @@
-call "%~dp0..\..\..\env.bat" %1 %2 %3
-call "%~dp0env.bat"
+call "%~dp0env.bat" %1 %2 %3
 
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 

diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index 12c9d7f2a48a895e23a0aa53a3c920131b53be36..08a92b3f8bb7a7a67dc33999ace0668095f9aa26 100755 (executable)
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,3 +1,5 @@
+call "%~dp0..\..\..\env.bat" %1 %2 %3
+
 SET "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 SET "CSF_ResourcesDefaults=%RES_DIR%"
 SET "CSF_TutorialResourcesDefaults=%RES_DIR%"

diff --git a/samples/qt/Tutorial/generation-vc-projects.bat b/samples/qt/Tutorial/generation-vc-projects.bat
index 03a1b81f2ba6b16a91210a5b3708076974161850..2d2c619504a318361ae207a23912e4b92d38d3cd 100644 (file)
--- a/samples/qt/Tutorial/generation-vc-projects.bat
+++ b/samples/qt/Tutorial/generation-vc-projects.bat
@@ -5,8 +5,7 @@ REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
 REM third argument specifies Debug or Release mode
 
-call "%~dp0..\..\..\env.bat" %1 %2 %3
-call "%~dp0env.bat"
+call "%~dp0env.bat" %1 %2 %3
 
 if not "%1" == "" (
     if /I "%1" == "vc8" (

diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat
index ae874b3f187838bf56fb10ce9f8839348b076e45..bd88eb624a7297ba8789702784f6549a351ee96c 100644 (file)
--- a/samples/qt/Tutorial/msvc.bat
+++ b/samples/qt/Tutorial/msvc.bat
@@ -1,5 +1,4 @@
-call "%~dp0..\..\..\env.bat" %1 %2 %3
-call "%~dp0env.bat"
+call "%~dp0env.bat" %1 %2 %3
 
 if ["%CASDEB%"] == [""] (
   call "%~dp0..\..\..\msvc.bat" %VCVER% win%ARCH% "" "%~dp0Tutorial-%VCVER%.sln"

diff --git a/samples/qt/Tutorial/run.bat b/samples/qt/Tutorial/run.bat
index 125bf5a48d271b8d6c81a5fb2ba2eeba8a4a5da0..7687c0999650e1693bddedecc96fb69e3f86d429 100644 (file)
--- a/samples/qt/Tutorial/run.bat
+++ b/samples/qt/Tutorial/run.bat
@@ -1,5 +1,4 @@
-call "%~dp0..\..\..\env.bat" %1 %2 %3
-call "%~dp0env.bat"
+call "%~dp0env.bat" %1 %2 %3
 
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 if ["%CASDEB%"] == [""] (