diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-04-20 13:34:38 +1000 |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2011-04-20 13:34:38 +1000 |
| commit | 0cc402f9ffeed86f60691b9a073ded2acb3a7b0f (patch) | |
| tree | 039659af148b5527e13273f50710c09dfd868476 /examples/qt3d/geometry | |
| parent | 06933198fe0b6ddc150c0ca84e4193058f155ce8 (diff) | |
Fixes to build system for mac.
Few paths wrong after recent windows commit.
Change-Id: Ia414c346be6bda5b22a30972063432fdb60db283
Diffstat (limited to 'examples/qt3d/geometry')
| -rw-r--r-- | examples/qt3d/geometry/geometry.pro | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro index 29a1f4c2e..9bdddc657 100644 --- a/examples/qt3d/geometry/geometry.pro +++ b/examples/qt3d/geometry/geometry.pro @@ -22,8 +22,23 @@ package { icons.path = /usr/share/themes/base/meegotouch/icons INSTALLS += icons applnk } - LIBS += -L../../../src/threed -lQt3D - INCLUDEPATH += ../../../include + macx:CONFIG(qt_framework, qt_framework|qt_no_framework) { + LIBS += -framework Qt3D -F../../../src/threed + INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers + } else { + win32 { + CONFIG(debug, debug|release) { + TARGET = $$member(TARGET, 0)d + LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib + } else { + LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib + } + } else { + LIBS += -L../../../src/threed -lQt3D + } + INCLUDEPATH += ../../../include/Qt3D + } + QT += opengl target.path += $$[QT_INSTALL_BINS] INSTALLS += target } else { |