AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use jom instead of nmake to compile configure.exe

Browse Source 
Change-Id: Ib463f09c2031e41515a7e3b1f9d1961712915413
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2015-07-15 16:23:51 -07:00
parent e81b955b41
commit 9072edb5f7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.bat
View File

@ -37,7 +37,7 @@ set QTDIR=%CD%
if not exist %QTSRC%.gitignore goto sconf if not exist %QTSRC%.gitignore goto sconf
echo Please wait while bootstrapping configure ... 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%" == "" ( if "%perl.exe%" == "" (
echo Perl not found in PATH. Aborting. >&2 echo Perl not found in PATH. Aborting. >&2
@ -57,6 +57,9 @@ if not exist tools\configure (
cd tools\configure cd tools\configure
if errorlevel 1 goto exit 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 #### Generated by configure.bat - DO NOT EDIT! ####> Makefile
echo/>> 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 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. rem This must have a trailing space.
echo QTSRC = %QTSRC% >> Makefile echo QTSRC = %QTSRC% >> Makefile
set tmpl=win32 set tmpl=win32
set make=nmake
) else if not "%cl.exe%" == "" ( ) else if not "%cl.exe%" == "" (
echo CXX = cl>>Makefile echo CXX = cl>>Makefile
echo EXTRA_CXXFLAGS =>>Makefile echo EXTRA_CXXFLAGS =>>Makefile
rem This must have a trailing space. rem This must have a trailing space.
echo QTSRC = %QTSRC% >> Makefile echo QTSRC = %QTSRC% >> Makefile
set tmpl=win32 set tmpl=win32
set make=nmake
) else if not "%g++.exe%" == "" ( ) else if not "%g++.exe%" == "" (
echo CXX = g++>>Makefile echo CXX = g++>>Makefile
echo EXTRA_CXXFLAGS =>>Makefile echo EXTRA_CXXFLAGS =>>Makefile