Skip to content

Commit 6087a21

Browse files
author
Thomas Taschauer
committed
separate build.sh for simulator and device
1 parent 27ede8b commit 6087a21

5 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/ios_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install pods
1717
run: pod install
1818
- name: Run build.sh
19-
run: bash build.sh
19+
run: bash build-simulator.sh
2020
- name: Build
2121
run: |
2222
xcodebuild clean build -workspace OpenDocumentReader.xcworkspace -scheme "${scheme}" -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@ cmake_minimum_required(VERSION 3.12.4)
33
option (ODR_TEST "" OFF)
44
set(ODR_TEST OFF)
55

6-
# set both to ON for simulator builds, off for devices
7-
option(DISABLE_ASM "" OFF)
8-
set(DISABLE_ASM OFF)
9-
106
add_subdirectory(OpenDocument.core)

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ It's Android's first OpenOffice Document Reader... for iOS!
44
## Setup
55
1. run "git submodule update --init --recursive"
66
2. run "pod install"
7-
3. open workspace in Xcode
7+
3. run "bash build-simulator.sh" or "bash build-device.sh"
8+
4. open workspace in Xcode
File renamed without changes.

build-simulator.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
rm -rf build
4+
5+
mkdir build/
6+
cd build/
7+
cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE=../ios-cmake/ios.toolchain.cmake ../ -DDISABLE_ASM=ON
8+
cd ../

0 commit comments

Comments
 (0)