From 4994531230899c44a9d3b6d734c5abf03a66b889 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Wed, 3 Oct 2012 00:54:30 +1000 Subject: Made Qt project (qmake) configurable using environment variables on OS X. Also added a missing &reference symbol in heimdall/source/Arguments.h --- heimdall-frontend/heimdall-frontend.pro | 39 ++++++++++++++++++++++++++++----- heimdall/source/Arguments.h | 2 +- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro index 84093cc..cd2bb01 100644 --- a/heimdall-frontend/heimdall-frontend.pro +++ b/heimdall-frontend/heimdall-frontend.pro @@ -6,15 +6,44 @@ TEMPLATE = app TARGET = heimdall-frontend macx { - PRIVATE_FRAMEWORKS.files = /Library/Frameworks/QtCore.framework \ - /Library/Frameworks/QtGui.framework /Library/Frameworks/QtXml.framework + message("") + + QT_FRAMEWORKS_DIR = $$(QT_FRAMEWORKS_DIR) + isEmpty(QT_FRAMEWORKS_DIR) { + message("QT_FRAMEWORKS_DIR not specified, using default:") + QT_FRAMEWORKS_DIR = /System/Library/Frameworks + } + + message("QT_FRAMEWORKS_DIR = $$QT_FRAMEWORKS_DIR") + message("") + + 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 + } + + message("QMAKE_MACOSX_DEPLOYMENT_TARGET = $$QMAKE_MACOSX_DEPLOYMENT_TARGET") + message("") + + 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 + } + + 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.path = Contents/Frameworks QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 - QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk - config += x86 x86_64 ppc isEmpty(OUTPUTDIR) { diff --git a/heimdall/source/Arguments.h b/heimdall/source/Arguments.h index 55c196e..17f31fa 100644 --- a/heimdall/source/Arguments.h +++ b/heimdall/source/Arguments.h @@ -133,7 +133,7 @@ namespace Heimdall public: Arguments(const map& argumentTypes, const map& shortArgumentAliases = (map()), - const map argumentAliases = (map())); + const map& argumentAliases = (map())); ~Arguments(); -- cgit v1.2.3