aboutsummaryrefslogtreecommitdiffstats
path: root/heimdall-frontend
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2013-05-13 00:06:44 +1000
committerBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2013-05-13 00:06:44 +1000
commit4b089d808482f6e4c32250f29a3c723ef9c9d673 (patch)
treebc42317737f868e20e216ce8e0719dfdf9d9be9d /heimdall-frontend
parentc9e4f764c2cc81f3ab223116e73340ea33e1abcb (diff)
downloadexternal_heimdall-4b089d808482f6e4c32250f29a3c723ef9c9d673.zip
external_heimdall-4b089d808482f6e4c32250f29a3c723ef9c9d673.tar.gz
external_heimdall-4b089d808482f6e4c32250f29a3c723ef9c9d673.tar.bz2
Fix OS X qmake/environment variable usage in .pro file.
Diffstat (limited to 'heimdall-frontend')
-rw-r--r--heimdall-frontend/heimdall-frontend.pro36
1 files changed, 23 insertions, 13 deletions
diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index 1c3e5bc..ffd45ea 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,20 +36,20 @@ 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
@@ -49,7 +59,7 @@ macx {
isEmpty(OUTPUTDIR) {
DESTDIR = /Applications
} else {
- DESTDIR = $$(OUTPUTDIR)
+ DESTDIR = $$OUTPUTDIR
}
} else {
@@ -57,7 +67,7 @@ macx {
DESTDIR = ../Win32
!isEmpty(OUTPUTDIR) {
- target.path = $$(OUTPUTDIR)
+ target.path = $$OUTPUTDIR
INSTALLS += target
}
} else {
@@ -66,7 +76,7 @@ macx {
isEmpty(OUTPUTDIR) {
target.path = /usr/local/bin
} else {
- target.path = $$(OUTPUTDIR)
+ target.path = $$OUTPUTDIR
}
INSTALLS += target