diff options
author | Eike Ziller <eike.ziller@digia.com> | 2012-10-31 10:50:43 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 10:08:10 +0100 |
commit | 490379a3e3c94c9e69f34b0c2b688608bb319f42 (patch) | |
tree | c8a17f6686f73ee3592e8730a51e13b64e6a2b83 /configure | |
parent | 6a9b7130710577245a0731f7b47ad4c4b16c882d (diff) |
Mac: Fix compilation with -sdk option
The include paths that the mkspecs set into the OpenGL/AGL frameworks
must take the SDK into account.
(The headers in 10.8 have slightly changed wrt 10.7, leading to compile
errors because framework style includes (<OpenGL/foo.h>) within the system
headers are resolved to the SDK framework headers.)
Change-Id: I6113cdb95b462d587f593682e03e81e920f3f672
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 1 insertions, 5 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 |