From 13b73d94dc2f6fc707e94eb58aee449494128d82 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 17 Dec 2013 14:13:35 +0200 Subject: 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 --- ios/lo.xcconfig.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'ios/lo.xcconfig.in') 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 = -- cgit