Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Couple of tiny updates to Makefile (for android) and iOS readme. #1833

Merged
merged 3 commits into from Jul 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
Expand Up @@ -169,7 +169,7 @@ clean-tizen-x86:
rm -rf ${TIZEN_X86_BUILD_DIR}

android: android-demo
@echo "run: 'adb install -r platforms/android/demo/build/outputs/apk/demo-debug.apk'"
@echo "run: 'adb install -r platforms/android/demo/build/outputs/apk/debug/demo-debug.apk'"

android-sdk:
@cd platforms/android/ && \
Expand Down Expand Up @@ -197,6 +197,9 @@ ios: cmake-ios
ios-sim: cmake-ios
xcodebuild -workspace platforms/ios/Tangram.xcworkspace -scheme TangramDemo -configuration ${BUILD_TYPE} -sdk iphonesimulator ${XCPRETTY}

ios-xcode: cmake-ios
open platforms/ios/Tangram.xcworkspace

ios-docs:
ifeq (, $(shell which jazzy))
$(error "Please install jazzy by running 'gem install jazzy'")
Expand Down
9 changes: 3 additions & 6 deletions platforms/ios/README.md
Expand Up @@ -31,16 +31,13 @@ To get an API key visit: [developers.nextzen.org](https://developers.nextzen.org
Building the iOS demo application requires Xcode 9.0 or newer. From the root directory of the project, run:

```bash
make ios NEXTZEN_API_KEY=yourApiKeyHere
make ios-xcode NEXTZEN_API_KEY=yourApiKeyHere
```

You can optionally append a `BUILD_TYPE` variable to choose the build type, for example `BUILD_TYPE=Debug`.

This will generate and compile an Xcode project for the Tangram iOS framework and demo application. To run/debug the demo application, open the projects in the iOS Xcode workspace:

```bash
open platforms/ios/Tangram.xcworkspace
```
This will generate an Xcode project for the Tangram iOS framework and demo application and open the project in an Xcode
workspace.

Note on Code Signing and Provisioning Profiles:
* For Simulator: Code signing is not required, so you can ignore any signing errors in target _TangramDemo_ > _General_ > _Signing_.
Expand Down