diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 15:46:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 20:59:45 +0100 |
| commit | d28073d9eb0f35bae534470970e693a94463c549 (patch) | |
| tree | d3331dc068105893fecd93868dd078d1ea57edaf /mkspecs/common/mac.conf | |
| parent | 950b35cf97ad398f97883efd2a18ee97994a8a9c (diff) | |
Distinguish between 'mac' and 'macx' qmake scopes
The former applies both on Mac OS X and iOS, but 'macx' is specific to
Mac OS X.
ios.conf and macx.conf now share most of their settings in the common
mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so
that any overrides in the device config will apply afterwards. This
means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK.
Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/common/mac.conf')
| -rw-r--r-- | mkspecs/common/mac.conf | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf new file mode 100644 index 0000000000..5d7cb1a91b --- /dev/null +++ b/mkspecs/common/mac.conf @@ -0,0 +1,29 @@ +# +# qmake configuration for common Mac OS (OSX and iOS) +# + +!load(device_config): error(Could not successfully load device configuration) + +QMAKE_PLATFORM += mac + +QMAKE_RESOURCE = /Developer/Tools/Rez +QMAKE_EXTENSION_SHLIB = dylib +QMAKE_LIBDIR = + +# sdk.prf will prefix the proper SDK sysroot +QMAKE_INCDIR_OPENGL = \ + /System/Library/Frameworks/OpenGL.framework/Headers \ + /System/Library/Frameworks/AGL.framework/Headers/ + +QMAKE_FIX_RPATH = install_name_tool -id + +QMAKE_LFLAGS_RPATH = + +QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL +QMAKE_LIBS_THREAD = + +QMAKE_AR = ar cq +QMAKE_RANLIB = ranlib -s + +include(unix.conf) |