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/config.pri | |
| 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/config.pri')
| -rw-r--r-- | src/angle/src/config.pri | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index e057217309..6ba2cbdf7a 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -46,17 +46,6 @@ DEFINES += ANGLE_DISABLE_TRACE \ ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0 \ ANGLE_USE_NEW_PREPROCESSOR=1 -# Force release builds for now. Debug builds of ANGLE will generate libraries with -# the 'd' library suffix, but this means that the library name no longer matches that -# listed in the DEF file which causes errors at runtime. Using the DEF is mandatory -# to generate the import library because the symbols are not marked with __declspec -# and therefore not exported by default. With the import library, the debug build is -# useless, so just disable until we can find another solution. -CONFIG -= debug -CONFIG += release - -TARGET = $$qtLibraryTarget($$TARGET) - CONFIG(debug, debug|release) { DEFINES += _DEBUG } else { @@ -67,6 +56,9 @@ CONFIG(debug, debug|release) { CONFIG -= qt CONFIG += stl rtti_off 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 |