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

centralize auxiliary lib creation

Browse Source 
this covers convenience libraries which are linked into dlls (if we are
not building statically) and "proper" (installed) builds of 3rdparty
code.

Change-Id: I2f00248c0baa0e73346e477724bf49bbc62ba925
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-25 14:11:49 +02:00 committed by The Qt Project
parent 485b7424df
commit 9ab4142551
10 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mkspecs/features/qt_helper_lib.prf Normal file
View File

@ -0,0 +1,25 @@
#
# W A R N I N G
# -------------
#
# This file is not part of the Qt API. It exists purely as an
# implementation detail. It may change from version to version
# without notice, or even be removed.
#
# We mean it.
#
load(qt_build_paths)
TEMPLATE = lib
CONFIG -= qt
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
contains(QT_CONFIG, build_all): CONFIG += build_all
DESTDIR = $$MODULE_BASE_OUTDIR/lib
DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
installed: load(qt_installs)
TARGET = $$qtLibraryTarget($$TARGET)

9
src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro vendored
View File

@ -1,16 +1,11 @@
TARGET = qtharfbuzzng
TEMPLATE = lib
CONFIG += \
static \
hide_symbols \
exceptions_off rtti_off
CONFIG -= qt
contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release
contains(QT_CONFIG, build_all):CONFIG += build_all
DESTDIR = $$QT_BUILD_TREE/lib
load(qt_helper_lib)
DEFINES += HAVE_CONFIG_H
HEADERS += $$PWD/src/config.h
@ -133,5 +128,3 @@ mac {
# even in 10.8 where they were also made available stand-alone.
LIBS_PRIVATE += -framework ApplicationServices
}
TARGET = $$TARGET$$qtPlatformTargetSuffix()

1
src/angle/src/common/common.pri
View File

@ -1,3 +1,4 @@
CONFIG += installed
include (../config.pri)
INCLUDEPATH += \

3
src/angle/src/compiler/preprocessor/preprocessor.pro
View File

@ -1,7 +1,4 @@
TEMPLATE = lib
CONFIG += static
TARGET = $$qtLibraryTarget(preprocessor)
include(../../config.pri)
INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor

3
src/angle/src/compiler/translator.pro
View File

@ -1,7 +1,4 @@
TEMPLATE = lib
CONFIG += static
TARGET = $$qtLibraryTarget(translator)
include(../config.pri)
# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here

9
src/angle/src/config.pri
View File

@ -59,17 +59,10 @@ CONFIG(debug, debug|release) {
}
# c++11 is needed by MinGW to get support for unordered_map.
CONFIG -= qt
CONFIG += stl exceptions c++11
contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release
contains(QT_CONFIG, build_all):CONFIG += build_all
INCLUDEPATH += . .. $$PWD/../include
DESTDIR = $$QT_BUILD_TREE/lib
DLLDESTDIR = $$QT_BUILD_TREE/bin
msvc {
# Disabled Warnings:
# 4100: 'identifier' : unreferenced formal parameter
@ -107,3 +100,5 @@ gcc {
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
load(qt_helper_lib)

9
src/angle/src/d3dcompiler/d3dcompiler.pro
View File

@ -1,9 +1,8 @@
TEMPLATE = lib
TARGET = $$qtLibraryTarget(d3dcompiler_qt)
TARGET = d3dcompiler_qt
CONFIG += installed
include(../config.pri)
CONFIG += qt
CONFIG += qt
QT = core
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
SOURCES += main.cpp
@ -16,5 +15,3 @@ winrt:equals(WINSDK_VER, 8.1) {
# __stdcall exports get mangled, so use a def file
DEF_FILE += $${TARGET}.def
load(qt_installs)

6
src/angle/src/libEGL/libEGL.pro
View File

@ -1,6 +1,4 @@
TEMPLATE = lib
TARGET = $$qtLibraryTarget(libEGL)
CONFIG += installed
include(../common/common.pri)
angle_d3d11: \
@ -30,8 +28,6 @@ SOURCES += \
mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw32.def
}
load(qt_installs)
egl_headers.files = \
$$ANGLE_DIR/include/EGL/egl.h \
$$ANGLE_DIR/include/EGL/eglext.h \

11
src/angle/src/libGLESv2/libGLESv2.pro
View File

@ -1,7 +1,4 @@
TEMPLATE = lib
TARGET = $$qtLibraryTarget(libGLESv2)
CONFIG += simd
CONFIG += simd installed
include(../common/common.pri)
INCLUDEPATH += $$OUT_PWD/.. $$ANGLE_DIR/src/libGLESv2
@ -13,8 +10,8 @@ angle_d3d11: \
LIBS_PRIVATE += -ld3d9
LIBS_PRIVATE += -ldxguid
STATICLIBS = translator preprocessor
STATICLIBS = translator preprocessor
for(libname, STATICLIBS) {
# Appends 'd' to the library for debug builds and builds up the fully
# qualified path to pass to the linker.
@ -238,8 +235,6 @@ for (vs, VERTEX_SHADERS_CLEAR) {
angle_d3d11: QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
}
load(qt_installs)
khr_headers.files = $$ANGLE_DIR/include/KHR/khrplatform.h
khr_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/KHR
gles2_headers.files = \
@ -248,5 +243,3 @@ gles2_headers.files = \
$$ANGLE_DIR/include/GLES2/gl2platform.h
gles2_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/GLES2
INSTALLS += khr_headers gles2_headers

5
src/plugins/platforms/xcb/xcb-static/xcb-static.pro
View File

@ -3,9 +3,8 @@
# libxcb-fixes, libxcb-randr, libxcb-shm, libxcb-sync, libxcb-image,
# libxcb-keysyms, libxcb-icccm, libxcb-renderutil, libxcb-xkb
#
TEMPLATE = lib
TARGET = xcb-static
CONFIG += staticlib
CONFIG += static
load(qt_helper_lib)
XCB_DIR = ../../../../3rdparty/xcb