AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename gcc-base-macx.conf to gcc-base-mac.conf and use it for iOS as well

Browse Source 
The only difference between the two is that iOS append @executable_path/
to QMAKE_LFLAGS_SONAME, but since shared libraries are not supported on
iOS anyways, this is not really something we have to care about.

Change-Id: I4797a4dfb94d9b3af03af22618351b98b48f8255
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-03-02 15:46:37 +01:00 committed by The Qt Project
parent 26b260c0c1
commit d28f454a67
14 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mkspecs/common/gcc-base-ios.conf
View File

@ -1,33 +0,0 @@
#
# Base qmake configuration for GCC on iOS
#
# 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(gcc-base.conf)
QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4
QMAKE_CFLAGS_DEBUG += -gdwarf-2
QMAKE_CXXFLAGS_DEBUG += -gdwarf-2
QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS
QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
QMAKE_LFLAGS += -headerpad_max_install_names
QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace
QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}@executable_path/
QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE}
QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}

2
mkspecs/common/gcc-base-macx.conf → mkspecs/common/gcc-base-mac.conf
View File

@ -1,5 +1,5 @@
#
# Base qmake configuration for GCC on Mac OS X
# Base qmake configuration for GCC on Mac OS X and iOS
#
# Before making changes to this file, please read the comment in
# gcc-base.conf, to make sure the change goes in the right place.

5
mkspecs/common/gcc-base.conf
View File

@ -7,8 +7,7 @@
#
# Platform-specific options shared by these compilers are put into:
#
# - gcc-base-ios.conf
# - gcc-base-macx.conf
# - gcc-base-mac.conf
# - gcc-base-unix.conf
#
# These base files are then combined with configurations for each compiler:
@ -20,7 +19,7 @@
# - clang.conf
#
# The combination happens in the top level mkspec, by including a platform-
# specific version of the base-file, for example gcc-base-macx.conf, and then
# specific version of the base-file, for example gcc-base-mac.conf, and then
# a (possibly platform-specific) version of the actual compiler configuration,
# for example g++-macx.conf.
#

2
mkspecs/macx-clang-32/qmake.conf
View File

@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-clang-libc++-32/qmake.conf
View File

@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-clang-libc++/qmake.conf
View File

@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-clang/qmake.conf
View File

@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-g++-32/qmake.conf
View File

@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6

2
mkspecs/macx-g++/qmake.conf
View File

@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6

2
mkspecs/macx-g++40/qmake.conf
View File

@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6

2
mkspecs/macx-g++42/qmake.conf
View File

@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6

2
mkspecs/macx-llvm/qmake.conf
View File

@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/llvm.conf)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6

2
mkspecs/macx-xcode/qmake.conf
View File

@ -8,7 +8,7 @@ MAKEFILE_GENERATOR = XCODE
CONFIG += lib_version_first incremental plugin_no_soname app_bundle
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6

2
mkspecs/unsupported/macx-ios-clang/qmake.conf
View File

@ -10,7 +10,7 @@ isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos
# keep things simple, e.g. by defining Q_OS_MAC _and_ Q_OS_IOS.
include(../../common/macx.conf)
include(../../common/gcc-base-ios.conf)
include(../../common/gcc-base-mac.conf)
include(../../common/xcode.conf)
include(../../common/clang.conf)
include(../../common/clang-mac.conf)