From 63fb818eb7ca6d6ba1eae59b92cb4e939bf7dd4d Mon Sep 17 00:00:00 2001 From: bugmaster Date: Wed, 24 Jul 2013 15:41:33 +0400 Subject: [PATCH] Update of environment files of qt samples for compilation in batch mode. --- samples/qt/IESample/env.bat | 2 ++ samples/qt/IESample/generation-vc-projects.bat | 3 +-- samples/qt/IESample/msvc.bat | 3 +-- samples/qt/IESample/run.bat | 3 +-- samples/qt/Tutorial/env.bat | 2 ++ samples/qt/Tutorial/generation-vc-projects.bat | 3 +-- samples/qt/Tutorial/msvc.bat | 3 +-- samples/qt/Tutorial/run.bat | 3 +-- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat index 69284cc0da..3fa44b6319 100755 --- 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 b22d9295e6..7694e23ad9 100644 --- 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 4aa44bd2f6..eac8f9fe50 100644 --- 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 14e0592a0b..0c1b69fd26 100644 --- 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 12c9d7f2a4..08a92b3f8b 100755 --- 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 03a1b81f2b..2d2c619504 100644 --- 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 ae874b3f18..bd88eb624a 100644 --- 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 125bf5a48d..7687c09996 100644 --- 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%"] == [""] (