diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-27 11:44:11 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-27 13:11:08 (GMT) |
| commit | 48d19919cc82f637ee96873f81c957cdf9b84127 (patch) | |
| tree | 7002cbcba4efe80acf9b4f0b6bb5cffa8f8f97e9 /mkspecs/common/g++-macx.conf | |
| parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
| download | Qt-48d19919cc82f637ee96873f81c957cdf9b84127.zip Qt-48d19919cc82f637ee96873f81c957cdf9b84127.tar.gz Qt-48d19919cc82f637ee96873f81c957cdf9b84127.tar.bz2 | |
mkspecs: Emit warning when including g++.conf directly
86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people
with their own mkspec who would still include g++.conf directly. We now
print a warning if this situation is detected, and explain to the user
how they can fix their mkspec.
For convenience we redirect g++.conf to g++-unix.conf so that people's
mkspecs will still work.
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'mkspecs/common/g++-macx.conf')
| -rw-r--r-- | mkspecs/common/g++-macx.conf | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf new file mode 100644 index 0000000..2251157 --- /dev/null +++ b/mkspecs/common/g++-macx.conf @@ -0,0 +1,32 @@ +# +# Qmake configuration for the GNU C++ compiler on Mac OS X +# +# Before making changes to this file, please read the comment in +# gcc-base.conf, to make sure the change goes in the right place. +# +# To verify that your change has the desired effect on the final configuration +# you can use the manual test in tests/manual/mkspecs. +# + +include(g++-base.conf) + +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2 +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2 +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g $$QMAKE_CFLAGS_DWARF2 + +QMAKE_LFLAGS_STATIC_LIB += -all_load + +QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=10.5 +QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=10.5 + +QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 +QMAKE_CXXFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64 +QMAKE_OBJECTIVE_CFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 +QMAKE_OBJECTIVE_CFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64 +QMAKE_LFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 +QMAKE_LFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64 + +QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +QMAKE_OBJCXXFLAGS_PRECOMPILE = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE |