Skip to content

Change to better test for dinput.h/HAVE_DINPUT_H#15978

Open
stahta01 wants to merge 3 commits into
libsdl-org:mainfrom
stahta01:main_staging
Open

Change to better test for dinput.h/HAVE_DINPUT_H#15978
stahta01 wants to merge 3 commits into
libsdl-org:mainfrom
stahta01:main_staging

Conversation

@stahta01

@stahta01 stahta01 commented Jul 12, 2026

Copy link
Copy Markdown
Contributor
  • I confirm that I am the author of this code and release it to the SDL project under the Zlib license. This contribution does not contain code from other sources, including code generated by a Large Language Model ("AI").

Changed the test for "dinput.h" to a test based on the "xinput.h" test.

Description

The simple test of "dinput.h" failed to work on Cygwin. This change fixes Cygwin and did not break Msys UCRT64 during my testing. And I verified that "windows.h" was needed under Cygwin.

I reversed the location change in response to a comment; That said "dinput (DirectInput) is part of DirectX".

Existing Issue(s)

@stahta01 stahta01 marked this pull request as ready for review July 12, 2026 10:41
Comment thread CMakeLists.txt
@stahta01 stahta01 marked this pull request as draft July 12, 2026 11:12
[sdl-ci-filter msvc-*]
[sdl-ci-filter msys2-*]
[sdl-ci-filter cygwin]
[sdl-ci-filter ngage]
@stahta01 stahta01 marked this pull request as ready for review July 12, 2026 11:49
Comment thread CMakeLists.txt Outdated
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
@sezero

sezero commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

Checks for the four others above probably need the same massage

@stahta01

Copy link
Copy Markdown
Contributor Author

Checks for the four others above probably need the same massage

I saw five places. Do you wish me to add another commit with the five places?

@stahta01

stahta01 commented Jul 12, 2026

Copy link
Copy Markdown
Contributor Author

Checks for the four others above probably need the same massage

I saw five places. Do you wish me to add another commit with the five places?

I double checked and one was a mistake; unless check_cxx_source_compiles counts.

I pushed the four places and that commit can just be ignored or I can remove it if it is not wanted.

@sezero

sezero commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

I meant the checks for d3d9.h, d3d11_1.h, ddraw.h and dsound.h above the dinput.h check.

@stahta01

stahta01 commented Jul 12, 2026

Copy link
Copy Markdown
Contributor Author

I meant the checks for d3d9.h, d3d11_1.h, ddraw.h and dsound.h above the dinput.h check.

Okay, I forced pushed to remove the commit that was wrong. I have verified those four files exist on my PC. I will work on adding the tests for them. It will take some time my PC takes 15 minutes a build cycle.
The four of them worked after the change under Cygwin.

@stahta01 stahta01 marked this pull request as draft July 12, 2026 18:13
[sdl-ci-filter cygwin]
[sdl-ci-filter msys2-*]
[sdl-ci-filter msvc-*]
[sdl-ci-filter ngage]
@stahta01 stahta01 marked this pull request as ready for review July 12, 2026 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants