diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-06-01 15:44:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 11:10:55 +0200 |
| commit | 47c2274f821bd6e974ebe2e41f45c7dc4fa3e802 (patch) | |
| tree | 95e25700c948584124bc51d1fb991835e10d83fd /examples/exampleresources | |
| parent | 8bee354224dd732960654ddbfaea5dbc312f0fc2 (diff) | |
Link to example assets static lib on windows
With this change Qt3D 2 now compiles and links on Windows. At least with
MSVC 2012. The examples start but there is some issue with context or
window initialization as swapbuffers fails.
Change-Id: Ib90a6faf0f360efddefed800c66c3adb74df76b9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'examples/exampleresources')
| -rw-r--r-- | examples/exampleresources/exampleresources.pri | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/exampleresources/exampleresources.pri b/examples/exampleresources/exampleresources.pri index f12283b0c..b8448408b 100644 --- a/examples/exampleresources/exampleresources.pri +++ b/examples/exampleresources/exampleresources.pri @@ -1,3 +1,13 @@ INCLUDEPATH += $$PWD -# TODO: Fix lib name for windows -LIBS += $$shadowed($$PWD)/libexampleresources.a + +win32 { + build_pass { + CONFIG(debug, debug|release) { + LIBS += $$shadowed($$PWD)/debug/exampleresources.$${QMAKE_EXTENSION_STATICLIB} + } else { + LIBS += $$shadowed($$PWD)/release/exampleresources.$${QMAKE_EXTENSION_STATICLIB} + } + } +} else { + LIBS += $$shadowed($$PWD)/libexampleresources.$${QMAKE_EXTENSION_STATICLIB} +} |