diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-09 07:06:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-09 07:06:52 +0000 |
| commit | 5bfac9d653357c906946563b9494d7ae69cdad92 (patch) | |
| tree | 0cc119af894a398497eba6f56fe2f224f6947616 /configure.bat | |
| parent | f08e1ecdc88e9373a31c1505d5db7f905431c644 (diff) | |
| parent | 77da617dc8e378a631ee8c15b1b414f16b87f147 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.bat b/configure.bat index 8c0819aeb5..1220bfedc2 100644 --- a/configure.bat +++ b/configure.bat @@ -37,7 +37,7 @@ set QTDIR=%CD% if not exist %QTSRC%.gitignore goto sconf echo Please wait while bootstrapping configure ... -for %%C in (cl.exe icl.exe g++.exe perl.exe) do set %%C=%%~$PATH:C +for %%C in (cl.exe icl.exe g++.exe perl.exe jom.exe) do set %%C=%%~$PATH:C if "%perl.exe%" == "" ( echo Perl not found in PATH. Aborting. >&2 @@ -57,6 +57,9 @@ if not exist tools\configure ( cd tools\configure if errorlevel 1 goto exit +set make=nmake +if not "%jom.exe%" == "" set make=jom + echo #### Generated by configure.bat - DO NOT EDIT! ####> Makefile echo/>> Makefile for /f "tokens=3 usebackq" %%V in (`findstr QT_VERSION_STR %QTSRC%src\corelib\global\qglobal.h`) do @echo QTVERSION = %%~V>> Makefile @@ -66,14 +69,12 @@ if not "%icl.exe%" == "" ( rem This must have a trailing space. echo QTSRC = %QTSRC% >> Makefile set tmpl=win32 - set make=nmake ) else if not "%cl.exe%" == "" ( echo CXX = cl>>Makefile echo EXTRA_CXXFLAGS =>>Makefile rem This must have a trailing space. echo QTSRC = %QTSRC% >> Makefile set tmpl=win32 - set make=nmake ) else if not "%g++.exe%" == "" ( echo CXX = g++>>Makefile echo EXTRA_CXXFLAGS =>>Makefile |