diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-07-01 16:43:10 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-07-03 13:20:34 +0200 |
| commit | 6dca9ebc3c89d2d8e1f3be5d3e73a9cafaf1bdb9 (patch) | |
| tree | b627fdb03658c4a46ed57cf2daa78ac0f12c8476 /src/core/config | |
| parent | d8245424b814591a4fbc4115c1fabe0a34479bb3 (diff) | |
Enable Chromium on Windows to link to correct ANGLE configuration.
This is done by setting qt_egl_library and qt_glesv2_library to
the correct value depending on whether the build is using debug or
release config.
This also updates the 3rdparty submodule as necessary.
Change-Id: I536310073d1d2436f7ed529b935421f6c9a8cae9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/windows.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index bb82eb783..94de6b4c7 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -15,3 +15,6 @@ GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\" # Gyp's parallel processing is broken on Windows GYP_ARGS += "--no-parallel" +CONFIG(release, debug|release): GYP_ARGS+= "qt_egl_library=\"libEGL.lib\" qt_glesv2_library=\"libGLESv2.lib\"" +else: GYP_ARGS+= "-D qt_egl_library=\"libEGLd.lib\" -D qt_glesv2_library=\"libGLESv2d.lib\"" + |