diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-25 14:11:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 19:49:44 +0200 |
| commit | 9ab41425519510b5bfbe93ac916e3f40aa0e4510 (patch) | |
| tree | fa743adfb429410b857778eab863b3d496fff26d /src/angle/src/libGLESv2 | |
| parent | 485b7424df5cb3474cc802bced77770d85bdcb37 (diff) | |
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 <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>
Diffstat (limited to 'src/angle/src/libGLESv2')
| -rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 11 |
1 files changed, 2 insertions, 9 deletions
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 - - |