diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-09-30 09:53:11 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-09-30 09:55:59 +0200 |
| commit | 4627857ed4bc4b750af0cad648d4ce02f10135e9 (patch) | |
| tree | 5469242bf48b57959e011bbeb00e259c383d1d71 /ios | |
| parent | 0d43f5176d34145b0965fdb2536cd6f454e985c5 (diff) | |
iOS, configure XCODE_* => IOS_*
Exporting variables XCODE_* makes xcodebuild read them,
independent of command line settings. Therefore renamed
these variables to IOS_ (they are only used to build iOS).
Change-Id: I2c44d2e8a1348270e2f2a6768e0552c39e7f7d72
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index fbb840ce1bef..63f1fd98993f 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -38,12 +38,12 @@ $(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk @echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSKITXC) @echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSKITXC) @echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSKITXC) - @echo "// variables are prefixed with XCODE_ to make it clear in configure.ac" >> $(IOSKITXC) + @echo "// variables are prefixed with IOS_ to make it clear in configure.ac" >> $(IOSKITXC) @echo "// what they will be used for." >> $(IOSKITXC) - @echo "ARCHS = $(XCODE_ARCHS)" >> $(IOSKITXC) - @echo "VALID_ARCHS = $(XCODE_ARCHS)" >> $(IOSKITXC) - @echo "CLANG_CXX_LIBRARY = $(XCODE_CLANG_CXX_LIBRARY)" >> $(IOSKITXC) - @echo "DEBUG_INFORMATION_FORMAT=$(XCODE_DEBUG_INFORMATION_FORMAT)" >> $(IOSKITXC) + @echo "ARCHS = $(IOS_ARCHS)" >> $(IOSKITXC) + @echo "VALID_ARCHS = $(IOS_ARCHS)" >> $(IOSKITXC) + @echo "CLANG_CXX_LIBRARY = $(IOS_CLANG_CXX_LIBRARY)" >> $(IOSKITXC) + @echo "DEBUG_INFORMATION_FORMAT=$(IOS_DEBUG_INFORMATION_FORMAT)" >> $(IOSKITXC) @echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSKITXC) @echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC) @@ -64,12 +64,12 @@ $(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk @echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSAPPXC) @echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSAPPXC) @echo "\n// These are actual Xcode-known settings. The corresponding autoconf" >> $(IOSAPPXC) - @echo "// variables are prefixed with XCODE_ to make it clear in configure.ac" >> $(IOSAPPXC) + @echo "// variables are prefixed with IOS_ to make it clear in configure.ac" >> $(IOSAPPXC) @echo "// what they will be used for." >> $(IOSAPPXC) - @echo "ARCHS = $(XCODE_ARCHS)" >> $(IOSAPPXC) - @echo "VALID_ARCHS = $(XCODE_ARCHS)" >> $(IOSAPPXC) - @echo "CLANG_CXX_LIBRARY = $(XCODE_CLANG_CXX_LIBRARY)" >> $(IOSAPPXC) - @echo "DEBUG_INFORMATION_FORMAT=$(XCODE_DEBUG_INFORMATION_FORMAT)" >> $(IOSAPPXC) + @echo "ARCHS = $(IOS_ARCHS)" >> $(IOSAPPXC) + @echo "VALID_ARCHS = $(IOS_ARCHS)" >> $(IOSAPPXC) + @echo "CLANG_CXX_LIBRARY = $(IOS_CLANG_CXX_LIBRARY)" >> $(IOSAPPXC) + @echo "DEBUG_INFORMATION_FORMAT=$(IOS_DEBUG_INFORMATION_FORMAT)" >> $(IOSAPPXC) @echo "\n// These settings are edited in CustomTarget_Lo_Xcconfig.mk." >> $(IOSAPPXC) @echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPPXC) @@ -149,8 +149,8 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup -xcconfig $(IOSKITXC) \ -project $(IOSKITPRJ) \ -target LibreOfficeKit \ - -sdk $(XCODEBUILD_SDK) \ - -arch $(XCODE_ARCHS) \ + -sdk $(IOS_SDK) \ + -arch $(IOS_ARCHS) \ -configuration $(if $(ENABLE_DEBUG),Debug,Release) \ build \ , $(WORKDIR)/ios/build.log \ @@ -168,8 +168,8 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT) -xcconfig $(IOSAPPXC) \ -project $(IOSAPPPRJ) \ -target LibreOfficeLight \ - -sdk $(XCODEBUILD_SDK) \ - -arch $(XCODE_ARCHS) \ + -sdk $(IOS_SDK) \ + -arch $(IOS_ARCHS) \ -configuration $(if $(ENABLE_DEBUG),Debug,Release) \ build \ , $(WORKDIR)/ios/build.log \ |