3f1548ae82
As Qt applications using OpenGL are linked against these libs, merging
them into QtANGLE by default (780105f906)
was a binary incompatible change. This change restores the default
behavior to the one before given change.
If the user wants the libraries to be merged, he can pass
combined-angle-lib to configure.
Task-number: QTBUG-60373
Change-Id: Iedbd3f2ce9284fdde924cfae8d915d6d5fef00db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
63 lines
1.9 KiB
Plaintext
63 lines
1.9 KiB
Plaintext
#
|
|
# qmake configuration for win32-icc
|
|
#
|
|
# Written for Intel C++
|
|
#
|
|
|
|
# Use the Visual Studio configuration
|
|
|
|
include(../common/msvc-desktop.conf)
|
|
|
|
# Now override with the Intel compiler settings
|
|
|
|
QMAKE_COMPILER += intel_icl # icl pretends to be msvc
|
|
|
|
QMAKE_CC = icl
|
|
QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738,809,3373
|
|
QMAKE_CFLAGS_WARN_ON = -W3 /Qwd673
|
|
QMAKE_CFLAGS_WARN_OFF = -W0 /Qwd673
|
|
QMAKE_CFLAGS_DEBUG = -Zi -MDd -Od
|
|
QMAKE_CFLAGS_LTCG = -Qipo
|
|
QMAKE_CFLAGS_DISABLE_LTCG = -Qno-ipo
|
|
QMAKE_CFLAGS_SSE2 = -QxSSE2
|
|
QMAKE_CFLAGS_SSE3 = -QxSSE3
|
|
QMAKE_CFLAGS_SSSE3 = -QxSSSE3
|
|
QMAKE_CFLAGS_SSE4_1 = -QxSSE4.1
|
|
QMAKE_CFLAGS_SSE4_2 = -QxSSE4.2
|
|
QMAKE_CFLAGS_AVX = -QxAVX
|
|
QMAKE_CFLAGS_AVX2 = -QxCORE-AVX2
|
|
QMAKE_CFLAGS_AVX512F += -QxCOMMON-AVX512
|
|
QMAKE_CFLAGS_AVX512CD += -QxCOMMON-AVX512
|
|
QMAKE_CFLAGS_AVX512ER += -QxMIC-AVX512
|
|
QMAKE_CFLAGS_AVX512PF += -QxMIC-AVX512
|
|
QMAKE_CFLAGS_AVX512DQ += -QxCORE-AVX512
|
|
QMAKE_CFLAGS_AVX512BW += -QxCORE-AVX512
|
|
QMAKE_CFLAGS_AVX512VL += -QxCORE-AVX512
|
|
QMAKE_CFLAGS_F16C = $$QMAKE_CFLAGS_AVX2
|
|
|
|
QMAKE_CXX = $$QMAKE_CC
|
|
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS /Zc:forScope
|
|
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
|
|
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
|
|
QMAKE_CXXFLAGS_CXX11 = -Qstd=c++11
|
|
# ICC supports the following but Qt won't compile
|
|
#QMAKE_CXXFLAGS_CXX14 = -Qstd=c++14
|
|
#QMAKE_CXXFLAGS_CXX1Z = -Qstd=c++1z
|
|
QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
|
|
QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG
|
|
|
|
QMAKE_LINK = xilink
|
|
QMAKE_LFLAGS = /NOLOGO
|
|
QMAKE_LFLAGS_RELEASE =
|
|
QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO =
|
|
QMAKE_LFLAGS_DEBUG = /DEBUG
|
|
QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
|
|
|
|
QMAKE_LIB = xilib /NOLOGO
|
|
|
|
DSP_EXTENSION = .dsp
|
|
|
|
include(../common/angle.conf)
|
|
|
|
load(qt_config)
|