CMake build options improvements #593
Merged
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the build configuration logic for MinGW and other platforms to properly manage the BUILD_XINPUT flag and simplify XAudio configuration. The changes consolidate platform-specific build settings and add new MinGW presets with GameInput support.
- Moved platform-specific configuration logic earlier in CMakeLists.txt for better organization
- Removed redundant
BUILD_XINPUTflag from theXAudio2Redistpreset in CMakePresets.json - Added new MinGW presets with GameInput support
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| CMakePresets.json | Removed BUILD_XINPUT from XAudio2Redist preset and added new MinGW-GI presets for GameInput support |
| CMakeLists.txt | Reorganized platform-specific configuration logic, added explicit XAudio settings for WINDOWS_STORE and Xbox, and simplified conditional checks |
scm-xbox
approved these changes
Nov 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 updates the use of CMake build options to address a few issues:
For VCPKG port, I want to add more features to control use of XInput vs. GameInput vs. WGI
For cases where you are building for Windows 10 or later, the default logic will try to use WGI for input. This causes link issues when the library was built for Windows 10, but the client wasn't or vice-versa. This ensures the expected build define is in the CMake targets--MSBuild targets still have to deal with this manually.
GameInput supports MinGW64, and otherwise can only use XInput.
This also includes some cleanup of the CMake logic.