summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-10-04 17:22:57 +0200
committerjan Iversen <jani@libreoffice.org>2017-10-04 18:43:13 +0200
commit7b5b3c041404c33b3d76eeea71920d042df5d8c3 (patch)
tree7513ed93edeb7e4d08e62f7b74f16a813ffb92d6 /ios
parente409e6b02745b528eb5ce497fd2583bd5035c425 (diff)
iOS, simulator compiles as nactive mac OSX host
Make simulator (and especially third party libraries) compile as OSX host, but with iPhonesimulator SDK. Change-Id: I2b282d1e84c5c6544dcb98413fec5c6e811efda6
Diffstat (limited to 'ios')
-rw-r--r--ios/CustomTarget_iOS.mk4
-rw-r--r--ios/README24
2 files changed, 17 insertions, 11 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index d765ca2426f6..55375687ff0e 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -116,7 +116,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj $(IOSKITXC) $(IOSAPPXC)
-project $(IOSKITPRJ) \
-target LibreOfficeKit \
-sdk $(IOS_SDK) \
- -arch $(IOS_ARCH) \
+ -arch $(CPU_NAME) \
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
build \
, $(WORKDIR)/ios/build.log \
@@ -134,7 +134,7 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
-project $(IOSAPPPRJ) \
-target LibreOfficeLight \
-sdk $(IOS_SDK) \
- -arch $(IOS_ARCH) \
+ -arch $(CPU_NAME) \
-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
build \
, $(WORKDIR)/ios/build.log \
diff --git a/ios/README b/ios/README
index d00b67e31f58..0151d72fd34c 100644
--- a/ios/README
+++ b/ios/README
@@ -23,7 +23,8 @@ Because the main work is done on the UI, where it is convenient to
switch fast between arm64 and simulator, it is advantageous to compile
the 3 configurations of LO first, and then link against those.
-Due to the multiple workdirs a distinct directory setup is needed
+Due to the multiple workdirs a separate work directories are needed as follows:
+(names/locations can be changes, they are "linked" together by running autogen.sh)
./core - libreoffice git clone (name can be changed)
./ios-arm64 - workdir for production, autogen.input:
standard +
@@ -39,7 +40,7 @@ Due to the multiple workdirs a distinct directory setup is needed
standard +
--enable-debug
--enable-ios-simulator
- --host=arm64-apple-darwin
+ #--host=arm64-apple-darwin
./ios-app - workdir for UI, NO autogen.input
-- Steps to generate
@@ -48,10 +49,15 @@ Due to the multiple workdirs a distinct directory setup is needed
Correct as per above, add your local setup (e.g. location of tarballs)
2) run ../core/autogen.sh in ios-arm64, ios-arm64-debug and ios-simulator
3) run make in ios-arm64, ios-arm64-debug and ios-simulator
- this will build LO is 3 configurations and store the LibreOfficeKit
- including generate ./*/ios/lo.xcconfig which prepares LO to be compiled
- libraries in ./ios-app/libraries as:
- ./ios-app/Library/LibreOfficeKit-arm64.a
- ./ios-app/Library/LibreOfficeKit-arm64-debug.a
- ./ios-app/Library/LibreOfficeKit-simulator.a
-4) open xcode with LibreOfficeLight and enjoy
+ this will generate ./*/ios/lo[Kit|App].xcconfig which prepares LO to be compiled
+ and build LOkit is 3 configurations and store the LibreOfficeKit
+ libraries in ./core/ios/generated as:
+ LibreOfficeKit-arm64.a
+ LibreOfficeKit-arm64-debug.a
+ LibreOfficeKit-simulator.a
+ *note* run "make build-nocheck" in ios-simulator for the time being
+4) run ../core/autogen.sh in ios-app
+5) open xcode with LibreOfficeLight add ./ios-app/ios/loApp.xconfig to the project.
+6) enjoy
+
+