From 9ab41425519510b5bfbe93ac916e3f40aa0e4510 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Apr 2014 14:11:49 +0200 Subject: centralize auxiliary lib creation 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 Reviewed-by: Laszlo Agocs Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- src/angle/src/libGLESv2/libGLESv2.pro | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/angle/src/libGLESv2') diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 6176016f13..70c58dc5a4 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -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 - - -- cgit v1.2.3