diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-17 14:13:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-17 14:22:11 +0200 |
| commit | 13b73d94dc2f6fc707e94eb58aee449494128d82 (patch) | |
| tree | 60a99d41ede56ce146729e1242c250ab885eea88 /ios | |
| parent | fa66ae3a739594da13fb78638ef98a2c8cc5ed2e (diff) | |
Pass also Xcode's ARCHS, OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS in lo.xcconfig
ARCHS tells Xcode to build the architecture for which the LO code has
been built. The CFLAGS properties make sure the same -D flags are used
as for the LO code.
Change-Id: I3c8af0ff9fba7d0b4eddbc0af9aad44fb385314c
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_Lo_Xcconfig.mk | 12 | ||||
| -rw-r--r-- | ios/lo.xcconfig.in | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk index b6032dacc8a3..31a697342edd 100644 --- a/ios/CustomTarget_Lo_Xcconfig.mk +++ b/ios/CustomTarget_Lo_Xcconfig.mk @@ -15,10 +15,16 @@ $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig): $(LO_XCCONFIG) .PHONY : $(LO_XCCONFIG) $(LO_XCCONFIG) : - # Edit in the list of all our (static) libs in the Xcode - # configuration file. + # Edit the Xcode configuration file: + # - the list of all our (static) libs + # - compiler flags + # all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \ - sed -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|" < $(LO_XCCONFIG) > $(LO_XCCONFIG).new && mv $(LO_XCCONFIG).new $(LO_XCCONFIG) + \ + sed -e "s,^\(LINK_LDFLAGS =\).*$$,\1 $$all_libs," \ + -e "s,^\(OTHER_CFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \ + -e "s,^\(OTHER_CPLUSPLUSFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \ + < $(LO_XCCONFIG) > $(LO_XCCONFIG).new && mv $(LO_XCCONFIG).new $(LO_XCCONFIG) # When SRCDIR!=BUILDDIR, Xcode is used on the project in the # *source* tree (because that is where the source files are). Copy diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in index c63e13cb4303..3f654ed76041 100644 --- a/ios/lo.xcconfig.in +++ b/ios/lo.xcconfig.in @@ -6,7 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -// Xcode configuration variables +// Xcode configuration properties // To avoid confusion, the LO-specific ones that aren't as such used // by Xcode (but only expanded in option values) are prefixed with @@ -17,11 +17,13 @@ LO_INSTDIR = @INSTDIR@ LO_SRCDIR = @SRC_ROOT@ LO_WORKDIR = @WORKDIR@ -// The value of this variable is inserted in -// CustomTarget_MobileLibreOffice_app.mk. -LINK_LDFLAGS = - // These are actual Xcode-known settings. The corresponding autoconf // variables are prefixed with XCODE_ to make it clear in configure.ac // what they will be used for. +ARCHS = @XCODE_ARCHS@ CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@ + +// These settings are edited in CustomTarget_Lo_Xcconfig.mk. +LINK_LDFLAGS = +OTHER_CFLAGS = +OTHER_CPLUSPLUSFLAGS = |