Fixed extra modules build script

vochlea · Jan 6, 2017 · f45fb91 · f45fb91
1 parent 8229cd7
commit f45fb91
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tools/build_qt.bat b/tools/build_qt.bat
@@ -8,7 +8,7 @@ start /W /BELOWNORMAL "Building Qt..." jom
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
 echo Installing Qt...
-start /W /BELOWNORMAL "Installing Qt..." nmake install
+start /W /BELOWNORMAL "Installing Qt..." jom install
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
 echo Qt sucessfully installed

diff --git a/tools/build_qt_extras.bat b/tools/build_qt_extras.bat
@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-set EXTPATH=%STARTDIR%\%EXTNAME%-opensource-src-%QTVER%
+set EXTPATH=%SRCDIR%\%EXTNAME%-opensource-src-%QTVER%
 set QMAKE=%QTINSTALLDIR%\bin\qmake.exe
 
 IF NOT "%EXTNAME%"=="" (

diff --git a/tools/setup_icu.sh b/tools/setup_icu.sh
@@ -4,10 +4,10 @@ export CPP=""
 export CC="cl"
 export CXX="cl"
 export LD="link"
-export CFLAGS="-MP -Gy -MT -O1 -DU_CHARSET_IS_UTF8"
+export CFLAGS="-MP -Gy -GL -MT -O1 -DU_CHARSET_IS_UTF8"
 export CXXFLAGS=$CFLAGS
 export CPPFLAGS=$CFLAGS
-export LDFLAGS="-NOLOGO -DYNAMICBASE -NXCOMPAT -OPT:ICF -OPT:REF"
+export LDFLAGS="-NOLOGO -DYNAMICBASE -NXCOMPAT -OPT:ICF -OPT:REF -LTCG"
 export MAKE="nmake"
 
 ICU_UNIX=$(echo $ICUINSTALLDIR | sed 's|\\|/|g')

diff --git a/tools/setup_qt.bat b/tools/setup_qt.bat
@@ -39,7 +39,7 @@ md %QTBUILDDIR%
 cd %QTBUILDDIR%  ||  exit /b %errorlevel%
 
 echo Configuring Qt...
-start /W /BELOWNORMAL "Configuring Qt..." %QTDIR%\configure.bat -prefix %QTINSTALLDIR% -platform %PLATFORM% -opensource -release -confirm-license -opengl dynamic -mp -static -no-shared -ltcg -qt-libpng -qt-libjpeg -qt-zlib -qt-pcre -angle -no-accessibility -nomake examples -openssl-linked -I %SSLINSTALLDIR%\include -L %SSLINSTALLDIR%\lib -I %ICUINSTALLDIR%\include -L %ICUINSTALLDIR%\lib ^&^& exit
+start /W /BELOWNORMAL "Configuring Qt..." %QTDIR%\configure.bat -prefix %QTINSTALLDIR% -platform %PLATFORM% -opensource -release -confirm-license -opengl dynamic -mp -static -no-shared -ltcg -qt-libpng -qt-libjpeg -qt-zlib -qt-pcre -angle -nomake examples -openssl-linked -I %SSLINSTALLDIR%\include -L %SSLINSTALLDIR%\lib -I %ICUINSTALLDIR%\include -L %ICUINSTALLDIR%\lib ^&^& exit
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
 echo Configuration complete