diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-30 08:57:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-01 08:30:38 +0100 |
| commit | 95a05904b9dfd48865dcdc0ef8941db794bb5d06 (patch) | |
| tree | a9ad4dde77d8c0e617df5286ae2c69216064c9aa /src/angle/src/libEGL | |
| parent | f229db5d57a5976db87d9d69826cae655b5e609a (diff) | |
ANGLE: Fix debug-and-release builds
Add a 'd' to debug builds to allow both release and debug builds
to be used.
- Add .def-files for Debug
- Build all libraries debug/release
- Add description to README.qt
- Differentiate debug/release in qmake.conf.
Task-number: QTBUG-28196
Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/angle/src/libEGL')
| -rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index 82ca914f7e..524e3a9b59 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -TARGET = libEGL +TARGET = $$qtLibraryTarget(libEGL) include(../common/common.pri) @@ -7,7 +7,7 @@ include(../common/common.pri) # in Surface.cpp, which would otherwise require -ldwmapi, which does not exist on Windows XP # (QTBUG-27741). LIBS += -ld3d9 -ldxguid \ - -L$$QT_BUILD_TREE/lib -llibGLESv2 + -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2) HEADERS += \ $$ANGLE_DIR/src/libEGL/Config.h \ @@ -24,6 +24,8 @@ SOURCES += \ $$ANGLE_DIR/src/libEGL/main.cpp \ $$ANGLE_DIR/src/libEGL/Surface.cpp +msvc:DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def + load(qt_installs) egl_headers.files = \ |