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.

Sign up for GitHub

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

Jump to bottom

Fix building on ios #317

Merged
merged 1 commit into from
Aug 31, 2019
Merged

Fix building on ios #317

merged 1 commit into from
Aug 31, 2019

Conversation

kvark
Copy link
Member

@kvark kvark commented Aug 30, 2019

Fixes #315

@kvark kvark requested a review from grovesNL August 30, 2019 13:07
@kvark
Copy link
Member Author

kvark commented Aug 30, 2019

Really want rust-lang/cargo#7260 here...

grovesNL
grovesNL approved these changes Aug 31, 2019
View reviewed changes
wgpu-native/Cargo.toml
gfx-backend-vulkan = { version = "0.3.0", features = ["x11"] }

[target.'cfg(not(unix))'.dependencies]
[target.'cfg(any(not(unix), target_os = "ios", target_os = "macos"))'.dependencies]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't need to build gfx-backend-vulkan on macOS or iOS if it will never be selected as the adapter, or do we want to purposely keep it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right, we need to be more consistent here with Vulkan: either allow the adapter, or disallow it at compile time... Let's follow-up with this.

@kvark
Copy link
Member Author

kvark commented Aug 31, 2019

bors r=grovesNL

bors bot added a commit that referenced this pull request Aug 31, 2019
@bors @kvark
Merge #317
0f26def 
317: Fix building on ios r=grovesNL a=kvark

Fixes #315 

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
@bors
Copy link
Contributor

bors bot commented Aug 31, 2019

Build succeeded

@bors bors bot merged commit 86bb809 into gfx-rs:master Aug 31, 2019
@kvark kvark deleted the ios branch August 31, 2019 04:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grovesNL grovesNL grovesNL approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cannot compile for iOS
2 participants
@kvark @grovesNL