diff options
author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
commit | 49a02b8c916e8ef011d9f56901d208eca626b85b (patch) | |
tree | 1148a42ede0e6661854b8f92d4bbe52a4290d02b /heimdall-frontend/heimdall-frontend.pro | |
parent | c82df274ecea32cd6528f070a21528bf80a2f466 (diff) | |
parent | f95619028fa5c80284e6ade2ced7772e41040424 (diff) | |
download | external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2 |
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts:
Linux/README
OSX/README.txt
heimdall-frontend/doc-pak/README
heimdall/doc-pak/README
Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'heimdall-frontend/heimdall-frontend.pro')
-rw-r--r-- | heimdall-frontend/heimdall-frontend.pro | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro index 1c3e5bc..6cb5774 100644 --- a/heimdall-frontend/heimdall-frontend.pro +++ b/heimdall-frontend/heimdall-frontend.pro @@ -5,19 +5,29 @@ TEMPLATE = app TARGET = heimdall-frontend +isEmpty(OUTPUTDIR) { + OUTPUTDIR = $$(OUTPUTDIR) +} + macx { message("") - QT_FRAMEWORKS_DIR = $$(QT_FRAMEWORKS_DIR) + isEmpty(QT_FRAMEWORKS_DIR) { + QT_FRAMEWORKS_DIR = $$(QT_FRAMEWORKS_DIR) + } + isEmpty(QT_FRAMEWORKS_DIR) { message("QT_FRAMEWORKS_DIR not specified, using default:") - QT_FRAMEWORKS_DIR = /System/Library/Frameworks + QT_FRAMEWORKS_DIR = /Library/Frameworks } message("QT_FRAMEWORKS_DIR = $$QT_FRAMEWORKS_DIR") message("") - QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET) + isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET) { + QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET) + } + isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET) { message("QMAKE_MACOSX_DEPLOYMENT_TARGET not specified, using default:") QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 @@ -26,30 +36,35 @@ macx { message("QMAKE_MACOSX_DEPLOYMENT_TARGET = $$QMAKE_MACOSX_DEPLOYMENT_TARGET") message("") - QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK) + isEmpty(QMAKE_MAC_SDK) { + QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK) + } + isEmpty(QMAKE_MAC_SDK) { message("QMAKE_MAC_SDK not specified, using default:") - QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4.sdk + QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.7.sdk } message("QMAKE_MAC_SDK = $$QMAKE_MAC_SDK") message("") - QMAKE_MACOSX_DEPLOYMENT_TARGET = $$MACOSX_DEPLOYMENT_TARGET - QMAKE_MAC_SDK = $$MAC_SDK - - PRIVATE_FRAMEWORKS.files = $$(QTFRAMEWORKSDIR)/QtCore.framework \ - $$(QTFRAMEWORKSDIR)//QtGui.framework $$(QTFRAMEWORKSDIR)/QtXml.framework + PRIVATE_FRAMEWORKS.files = $$QT_FRAMEWORKS_DIR/QtCore.framework \ + $$QT_FRAMEWORKS_DIR//QtGui.framework $$QT_FRAMEWORKS_DIR/QtXml.framework PRIVATE_FRAMEWORKS.path = Contents/Frameworks QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS + LIBS += -L/usr/lib config += x86 x86_64 ppc + + QMAKE_CFLAGS_X86_64 = -m64 -mmacosx-version-min=10.5 + QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 + QMAKE_LFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 isEmpty(OUTPUTDIR) { DESTDIR = /Applications } else { - DESTDIR = $$(OUTPUTDIR) + DESTDIR = $$OUTPUTDIR } } else { @@ -57,7 +72,7 @@ macx { DESTDIR = ../Win32 !isEmpty(OUTPUTDIR) { - target.path = $$(OUTPUTDIR) + target.path = $$OUTPUTDIR INSTALLS += target } } else { @@ -66,7 +81,7 @@ macx { isEmpty(OUTPUTDIR) { target.path = /usr/local/bin } else { - target.path = $$(OUTPUTDIR) + target.path = $$OUTPUTDIR } INSTALLS += target @@ -85,6 +100,7 @@ INCLUDEPATH += ./GeneratedFiles \ ./GeneratedFiles/Release \ ../libpit/Source \ . +unix:INCLUDEPATH += /usr/include DEPENDPATH += . MOC_DIR += ./GeneratedFiles/release OBJECTS_DIR += release |