FIX: OS X + Carthage - #164
Merged
Merged
Conversation
First we check to see if we are on the iOS or tvOS. If not, then we defer back to OS X. TARGET_OS_IPHONE is a variant of TARGET_OS_MAC, which makes this whole thing really stupid.
Collaborator
|
Do we need to check for WATCH_OS anywhere? Separately, can you make an macro that expands to all the other targets? I.E.
|
Collaborator
|
Thank you for doing this! |
Contributor
Author
|
Are you wanting to support watchOS? :) I left it out because I didn't think it was a supported platform. |
Make it easier to differentiate between Mac and iOS / tvOS targets.
Collaborator
|
Ha, you're right, I was thinking PINCache. |
Collaborator
|
Sorry to ask for one more change: Can you change the |
Contributor
Author
|
Done! |
Collaborator
|
Thanks for doing this @justin! |
This was referenced Mar 18, 2016
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This does two things
TargetConditionals.hfile so that thePINImagemacros play nicely when including a framework.