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 /demos | |
parent | 06933198fe0b6ddc150c0ca84e4193058f155ce8 (diff) |
Fixes to build system for mac.
Few paths wrong after recent windows commit.
Change-Id: Ia414c346be6bda5b22a30972063432fdb60db283
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 0781c401..98a5006d 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 a1073d46..6c530bdf 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 93718720..093e0bd4 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 592ac1e3..f348c076 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 63da4de2..195f5e0e 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 { |