Permalink
Browse files

Made Qt project (qmake) configurable using environment variables on O…

…S X. Also added a missing &reference symbol in heimdall/source/Arguments.h
  • Loading branch information...
1 parent 2826991 commit 4994531230899c44a9d3b6d734c5abf03a66b889 @Benjamin-Dobell committed Oct 2, 2012
Showing with 35 additions and 6 deletions.
  1. +34 −5 heimdall-frontend/heimdall-frontend.pro
  2. +1 −1 heimdall/source/Arguments.h
@@ -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) {
@@ -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();

0 comments on commit 4994531

Please sign in to comment.