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 69284cc..3fa44b6 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 b22d929..7694e23 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 4aa44bd..eac8f9f 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 14e0592..0c1b69f 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 12c9d7f..08a92b3 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 03a1b81..2d2c619 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 ae874b3..bd88eb6 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 125bf5a..7687c09 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%"] == [""] (