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

[cmake][windows] use correct d3dcompiler depending on target architecture #11798

Merged
merged 1 commit into from Mar 6, 2017

Conversation

@Rechi
Copy link
Member

commented Mar 3, 2017

Description

Use the correct d3dcompiler depending on the target architecture.

Motivation and Context

Without this change win32 version of d3dcompiler is also packed in x64 and therefore Kodi can't start.

How Has This Been Tested?

Tested on win32 and x64.

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed
@Rechi Rechi added this to the L 18.0-alpha1 milestone Mar 3, 2017
@Rechi Rechi requested a review from Paxxi Mar 3, 2017
@Rechi

This comment has been minimized.

Copy link
Member Author

commented Mar 3, 2017

jenkins build this please

Copy link
Member

left a comment

Use https://cmake.org/cmake/help/v3.0/variable/CMAKE_SIZEOF_VOID_P.html to check the bitness instead of trying to compile

@wsnipex

This comment has been minimized.

Copy link
Member

commented Mar 4, 2017

32/64 bit checks should go into ArchSetup.cmake

@Rechi Rechi force-pushed the Rechi:winD3dcompiler branch from e969686 to 6b3b878 Mar 5, 2017
@Rechi

This comment has been minimized.

Copy link
Member Author

commented Mar 5, 2017

@wsnipex updated
@Paxxi changed as you requested, but documentation for CMAKE_SIZEOF_VOID_P says [...] is determined by a try compile. So I don't see any advantage on this method.

@Paxxi

This comment has been minimized.

Copy link
Member

commented Mar 5, 2017

@Rechi it's always done by cmake so it's in reality free but the more important thing for me is that it's the correct way to handle it in cmake. Makes it easier to read and grasp if familiar with cmake from other projects

@wsnipex

This comment has been minimized.

Copy link
Member

commented Mar 6, 2017

why not move SDK_ARCH to ArchSetup as well? Sooner or later this var might be useful/needed in other places as well

@Rechi Rechi force-pushed the Rechi:winD3dcompiler branch from 6b3b878 to dd9d336 Mar 6, 2017
@Rechi

This comment has been minimized.

Copy link
Member Author

commented Mar 6, 2017

updated

@wsnipex
wsnipex approved these changes Mar 6, 2017
@Paxxi
Paxxi approved these changes Mar 6, 2017
@Paxxi Paxxi merged commit b0028dc into xbmc:master Mar 6, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@Rechi Rechi deleted the Rechi:winD3dcompiler branch Mar 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.