From 26b260c0c18a50080ac75081b60671e4b1f04438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sat, 2 Mar 2013 15:13:38 +0100 Subject: Rename common/mac.conf to common/macx.conf This is a step towards making mac a shared scope for both Mac OS X and iOS, while macx is Mac OS X specific and ios is iOS specific. We'll then move iOS to not include macx.conf, once we make the change to not have iOS imply macx. Change-Id: Ic9ce4d597873aa3cf2c981598354733e07db644d Reviewed-by: Oswald Buddenhagen Reviewed-by: Richard Moe Gustavsen --- mkspecs/common/macx.conf | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 mkspecs/common/macx.conf (limited to 'mkspecs/common/macx.conf') diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf new file mode 100644 index 0000000000..5f5ed80e4d --- /dev/null +++ b/mkspecs/common/macx.conf @@ -0,0 +1,34 @@ +# +# qmake configuration for common Mac OS X +# +!load(device_config) { + error(Could not successfully load device configuration) +} + +QMAKE_PLATFORM += macx mac + +isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = macosx + +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) -- cgit v1.2.3 From d28073d9eb0f35bae534470970e693a94463c549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sat, 2 Mar 2013 15:46:37 +0100 Subject: 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 Reviewed-by: Richard Moe Gustavsen --- mkspecs/common/macx.conf | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'mkspecs/common/macx.conf') diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 5f5ed80e4d..eb39d1cf8d 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -1,34 +1,8 @@ # # qmake configuration for common Mac OS X # -!load(device_config) { - error(Could not successfully load device configuration) -} -QMAKE_PLATFORM += macx mac +QMAKE_PLATFORM += macx +QMAKE_MAC_SDK = macosx -isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = macosx - -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) +include(mac.conf) -- cgit v1.2.3