vitalif
/
heimdall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made Qt project (qmake) configurable using environment variables on OS X. Also added a missing &reference symbol in heimdall/source/Arguments.h

alt_setting-error
Benjamin Dobell 2012-10-03 00:54:30 +10:00
parent 28269910f2
commit 4994531230
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
heimdall-frontend/heimdall-frontend.pro
View File

@ -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) {

2
heimdall/source/Arguments.h
View File

@ -133,7 +133,7 @@ namespace Heimdall
public:
Arguments(const map<string, ArgumentType>& argumentTypes, const map<string, string>& shortArgumentAliases = (map<string, string>()),
const map<string, string> argumentAliases = (map<string, string>()));
const map<string, string>& argumentAliases = (map<string, string>()));
~Arguments();