From b927255da0a1bda8067e8ffe65e39d452ff00b35 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 9 Jan 2010 12:26:34 +0200 Subject: [PATCH] Improve build.bat to support building from QT prompt. --- build.bat | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index e357e93e0..05808ac47 100644 --- a/build.bat +++ b/build.bat @@ -10,6 +10,13 @@ REM - build release targets (new switch?) REM - add "all" target REM - run tests too +REM QT prompt sets QMAKESPEC +if NOT "%QMAKESPEC%" == "" ( + set MAKE=mingw32-make +) else ( + set MAKE=nmake +) + if "%1" == "cppcheck" goto cppcheck if "%1" == "gui" goto gui if "%1" == "tests" goto tests @@ -18,23 +25,22 @@ goto help :cppcheck cd cli qmake -nmake +%MAKE% cd .. goto end :gui cd gui qmake -nmake +%MAKE% lrelease gui.pro -copy *.qm debug cd .. goto end :tests cd test qmake -nmake +%MAKE% cd .. goto end