From 9072edb5f7f2b9f634fac5b5de7090e94ee491f7 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 15 Jul 2015 16:23:51 -0700 Subject: Use jom instead of nmake to compile configure.exe Change-Id: Ib463f09c2031e41515a7e3b1f9d1961712915413 Reviewed-by: Oswald Buddenhagen --- configure.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'configure.bat') 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 -- cgit v1.2.3