diff options
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/common/angle.conf | 13 | ||||
-rw-r--r-- | mkspecs/common/msvc-desktop.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/windows-gles.conf | 7 | ||||
-rw-r--r-- | mkspecs/common/winrt_winphone/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/features/win32/idcidl.prf | 9 | ||||
-rw-r--r-- | mkspecs/features/win32/opengl.prf | 10 | ||||
-rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/win32-icc/qmake.conf | 2 |
8 files changed, 29 insertions, 18 deletions
diff --git a/mkspecs/common/angle.conf b/mkspecs/common/angle.conf new file mode 100644 index 0000000000..fad0e719d2 --- /dev/null +++ b/mkspecs/common/angle.conf @@ -0,0 +1,13 @@ +# Renaming these files requires that the LIBRARY entry of their corresponding +# def files are also updated to reflect the name. +# The .def files are found in the angle directories: +# +# qtbase\src\3rdparty\angle\src\libEGL\libEGL[d?].def +# qtbase\src\3rdparty\angle\src\libEGL\libGLESv2[d?].def +# +# If a combined ANGLE library is used, the def files will automatically be +# combined into QtANGLE[d?].def by QtAngle.pro. + +LIBEGL_NAME = libEGL +LIBGLESV2_NAME = libGLESv2 +LIBQTANGLE_NAME = QtANGLE diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index d28c48506c..50745c3621 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -108,5 +108,5 @@ VCPROJ_EXTENSION = .vcproj VCSOLUTION_EXTENSION = .sln VCPROJ_KEYWORD = Qt4VSv1.0 -include(windows-gles.conf) +include(angle.conf) include(windows-vulkan.conf) diff --git a/mkspecs/common/windows-gles.conf b/mkspecs/common/windows-gles.conf deleted file mode 100644 index 78b96c42d4..0000000000 --- a/mkspecs/common/windows-gles.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Output name of Qt's ANGLE GLES library. (Note that this is different from upstream ANGLE) -LIBQTANGLE_NAME = QtANGLE - -# Set up .lib files used for linking -QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 -QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG - diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 1b9bf4d20f..c440d53867 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -96,6 +96,6 @@ WINRT_ASSETS_PATH = $$PWD/assets WINRT_MANIFEST.capabilities = defaults WINRT_MANIFEST.capabilities_device = defaults -include(../windows-gles.conf) +include(../angle.conf) load(qt_config) diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf index fba7173e79..922ae3f99e 100644 --- a/mkspecs/features/win32/idcidl.prf +++ b/mkspecs/features/win32/idcidl.prf @@ -14,13 +14,8 @@ contains(TEMPLATE, "vc.*") { ACTIVEQT_IDC = $${QMAKE_IDC} ACTIVEQT_IDL = $${QMAKE_IDL} ACTIVEQT_TARGET = \"$(TargetPath)\" - win32-msvc { - ACTIVEQT_NEWLINE = $$escape_expand(\\t) - ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET} - } else { - ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) - ACTIVEQT_OUTPUT = $(IntDir)$${TARGET} - } + ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) + ACTIVEQT_OUTPUT = $(IntDir)$${TARGET} ACTIVEQT_TLBOUT = \"$(TargetDir)/$${TARGET}.tlb\" GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT} } else { diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index ebc29d0923..c6fba7770f 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,4 +1,14 @@ +QT_FOR_CONFIG += gui + qtConfig(opengles2) { + # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 + qtConfig(combined-angle-lib) { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } else { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } # For Desktop, use the ANGLE library location passed on from configure. INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 CONFIG(debug, debug|release) { diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 224c81fb4a..394dd7d8bd 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -79,7 +79,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_NM = $${CROSS_COMPILE}nm -P -include(../common/windows-gles.conf) +include(../common/angle.conf) include(../common/windows-vulkan.conf) include(../common/gcc-base.conf) diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index abf26f2894..863fd77ea9 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -59,7 +59,7 @@ QMAKE_LIB = xilib /NOLOGO DSP_EXTENSION = .dsp -include(../common/windows-gles.conf) +include(../common/angle.conf) include(../common/windows-vulkan.conf) load(qt_config) |