diff options
author | dpope <daniel.pope@nokia.com> | 2011-05-03 10:44:07 +1000 |
---|---|---|
committer | dpope <daniel.pope@nokia.com> | 2011-05-03 10:44:07 +1000 |
commit | bfb4cf855b729708f18740fe8e02163fb77dc9df (patch) | |
tree | dcea9f20ff13bb8019626f072701ddae060a3537 /demos | |
parent | ea11cfad8fdb491e94b7024bbdec125db8f57c1c (diff) | |
parent | 319b677c5ebf53530cf30435dfdb82232adb673a (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3d
Diffstat (limited to 'demos')
-rw-r--r-- | demos/qt3d/cubehouse/cubehouse.pro | 19 | ||||
-rw-r--r-- | demos/qt3d/pageflip/pageflip.pro | 20 | ||||
-rw-r--r-- | demos/qt3d/photobrowser3d/photobrowser3d.pro | 19 | ||||
-rw-r--r-- | demos/qt3d/shapes/shapes.pro | 19 | ||||
-rw-r--r-- | demos/qt3d/teaservice/teaservice.pro | 19 |
5 files changed, 85 insertions, 11 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro index 0781c4016..98a5006d1 100644 --- a/demos/qt3d/cubehouse/cubehouse.pro +++ b/demos/qt3d/cubehouse/cubehouse.pro @@ -21,8 +21,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 { diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro index a1073d464..6c530bdf2 100644 --- a/demos/qt3d/pageflip/pageflip.pro +++ b/demos/qt3d/pageflip/pageflip.pro @@ -16,9 +16,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 { diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index 93718720a..093e0bd47 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -63,8 +63,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 { diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro index 592ac1e32..f348c0764 100644 --- a/demos/qt3d/shapes/shapes.pro +++ b/demos/qt3d/shapes/shapes.pro @@ -14,8 +14,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 { diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro index 63da4de25..195f5e0ec 100644 --- a/demos/qt3d/teaservice/teaservice.pro +++ b/demos/qt3d/teaservice/teaservice.pro @@ -16,8 +16,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 { |