diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-11 14:33:10 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-11 14:33:10 +0000 |
| commit | d980478e6f69961c6932c2131050a478f90f8bb5 (patch) | |
| tree | 5ed43730d0aac68da98663ef838103a7f70d319a /gyp | |
| parent | a461ff0866526bc51dbd4c4f9f066a727ec21510 (diff) | |
Fix Qt OpenGL lib name on Windows and change the default qt_sdk var value on windows.
Over-the-shoulder review from robertphillips@google.com
git-svn-id: http://skia.googlecode.com/svn/trunk@5894 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/debugger.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index cbaf492190..d64050f647 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -47,8 +47,8 @@ }], [ 'skia_os == "win"', { 'variables': { - # TODO: location of systemwide Qt on Win? - 'qt_sdk%': 'C:/Qt/4.6.4/', + # This is the default location for the version of Qt current on 10/11/12 + 'qt_sdk%': 'C:/Qt/4.8.3/', }, 'qt_sdk': '<(qt_sdk)', 'qt_moc%': '<(qt_sdk)/bin/moc', @@ -61,7 +61,7 @@ 'qt_libs': [ '<(qt_sdk)/lib/QtCore4.lib', '<(qt_sdk)/lib/QtGui4.lib', - '<(qt_sdk)/lib/QtOpenGL.lib', + '<(qt_sdk)/lib/QtOpenGL4.lib', ], }], ], |