diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 7 |
2 files changed, 6 insertions, 7 deletions
@@ -1283,6 +1283,7 @@ while [ "$#" -gt 0 ]; do sdk) if [ "$BUILD_ON_MAC" = "yes" ]; then CFG_SDK="$VAL" + DeviceVar set QMAKE_MAC_SDK "$VAL" else UNKNOWN_OPT=yes fi @@ -6092,11 +6093,6 @@ elif [ "$CFG_OPENSSL" = "linked" ]; then echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$QTMODULE.tmp" fi -#dump in the SDK info -if [ '!' -z "$CFG_SDK" ]; then - echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$QTMODULE.tmp" -fi - # cmdline args cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp" rm -f "$QMAKE_VARS_FILE" 2>/dev/null diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 9830110347..e318cb775e 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -1,6 +1,9 @@ # # qmake configuration for common Mac OS X # +!load(device_config) { + error(Could not successfully load device configuration) +} QMAKE_PLATFORM += macx mac @@ -9,8 +12,8 @@ QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib QMAKE_LIBDIR = -QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ - /System/Library/Frameworks/AGL.framework/Headers/ +QMAKE_INCDIR_OPENGL = $$QMAKE_MAC_SDK/System/Library/Frameworks/OpenGL.framework/Headers \ + $$QMAKE_MAC_SDK/System/Library/Frameworks/AGL.framework/Headers/ QMAKE_FIX_RPATH = install_name_tool -id |