summaryrefslogtreecommitdiffstats
path: root/src/angle/src/libGLESv2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-11-30 08:57:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-01 08:30:38 +0100
commit95a05904b9dfd48865dcdc0ef8941db794bb5d06 (patch)
treea9ad4dde77d8c0e617df5286ae2c69216064c9aa /src/angle/src/libGLESv2
parentf229db5d57a5976db87d9d69826cae655b5e609a (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/libGLESv2')
-rw-r--r--src/angle/src/libGLESv2/libGLESv2.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index ae522b2dd5..f4cbfd0494 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-TARGET = libGLESv2
+TARGET = $$qtLibraryTarget(libGLESv2)
DEPENDPATH += . shaders
CONFIG += simd
@@ -67,6 +67,8 @@ SOURCES += \
SSE2_SOURCES += $$ANGLE_DIR/src/libGLESv2/TextureSSE2.cpp
+msvc:DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def
+
float_converter.target = float_converter
float_converter.commands = python $$ANGLE_DIR/src/libGLESv2/Float16ToFloat32.py \
> $$ANGLE_DIR/src/libGLESv2/Float16ToFloat32.cpp