Skip to content

Commit

Permalink
Merge pull request #96 from NiklasEi/fix_windows_ios_and_android_targets
Browse files Browse the repository at this point in the history
Fix windows and iOS targets
  • Loading branch information
NiklasEi authored Dec 29, 2023
2 parents 392c9a4 + d72d53a commit 5653f0e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release-android-google-play.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# For setup instructions regarding this workflow, see https://www.nikl.me/blog/2023/github_workflow_to_publish_android_app/

name: release-android-google-play

on:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release-ios-testflight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ name: release-ios-testflight
# The version from input is only used for artifact names and as the release to upload the final ipa to.
# Bump the versions in `mobile/ios-src/Info.plist` to change the version of your app bundle.

# Special setup and Apple Developer Program membership (99$/year) is required for this workflow! (docs are in work; Todo)
# Special setup and Apple Developer Program membership (99$/year) is required for this workflow!

# For setup instructions, see https://www.nikl.me/blog/2023/github_workflow_to_publish_ios_app/

on:
workflow_dispatch:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,14 @@ jobs:
- name: Install Cargo APK
run: cargo install --force cargo-apk
- name: Build app for Android
run: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --profile dist --package mobile
# This uses a debug build, since release builds require keystore configuration
# For AAB builds that can be pushed to the Play store, see the release-android-google-play workflow.
run: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --package mobile
- name: Upload release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: target/dist/apk/${{ env.GAME_OSX_APP_NAME }}.apk
file: target/debug/apk/${{ env.GAME_OSX_APP_NAME }}.apk
asset_name: ${{ env.GAME_EXECUTABLE_NAME }}_${{ env.VERSION }}_android.apk
release_name: ${{ env.VERSION }}
tag: ${{ env.VERSION }}
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Template for a Game using the awesome [Bevy engine][bevy] featuring out of the box builds for Windows, Linux, macOS, Web (Wasm), Android, and iOS.

# What does this template give you?

* small example ["game"](https://niklasei.github.io/bevy_game_template/)
* easy setup for running the web build using [trunk] (`trunk serve`)
* run the native version with `cargo run`
Expand All @@ -12,6 +13,7 @@ Template for a Game using the awesome [Bevy engine][bevy] featuring out of the b
* WARNING: if you work in a private repository, please be aware that macOS and Windows runners cost more build minutes. **For public repositories the builds are free!**

# How to use this template?

1. Click "Use this template" on the repository's page
2. Look for `ToDo` to use your own game name everywhere
3. [Update the icons as described below](#updating-the-icons)
Expand Down
2 changes: 1 addition & 1 deletion build/windows/installer/Package.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<!-- Installs the actual files -->
<ComponentGroup Id="MainComponent" Directory="INSTALLFOLDER">
<Component>
<File Id="Executable" Source="..\..\..\target\release\bevy_game.exe" Vital="true" /> <!-- ToDo this should point to your executable -->
<File Id="Executable" Source="..\..\..\target\dist\bevy_game.exe" Vital="true" /> <!-- ToDo this should point to your executable -->
</Component>
</ComponentGroup>

Expand Down
6 changes: 3 additions & 3 deletions mobile/mobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,15 @@
);
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = (
"$(inherited)",
"../target/aarch64-apple-ios/release",
"../target/aarch64-apple-ios/dist",
);
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = (
"$(inherited)",
"../target/aarch64-apple-ios-sim/release",
"../target/aarch64-apple-ios-sim/dist",
);
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64]" = (
"$(inherited)",
"../target/x86_64-apple-ios/release",
"../target/x86_64-apple-ios/dist",
);
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down

0 comments on commit 5653f0e

Please sign in to comment.