Skip to content

Reenable building on Windows 95 for SDL 1.2 #128

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

Merged
merged 7 commits into from
Apr 21, 2025

Conversation

ElpisActual
Copy link

Adds the former VS6 project files and defines socklen_t for the benefit of particularly old SDK versions.

@icculus
Copy link
Collaborator

icculus commented Apr 20, 2025

For 1.2?! This is fine with me, if no one else has any objections.

@sezero
Copy link
Contributor

sezero commented Apr 20, 2025

( CC: @ccawley2011 , Related: #42 )

@ElpisActual
Copy link
Author

Re socklen_t, fixed; re #42 and comments thereupon, GetAdaptersInfo only officially has support back to 98/2K, but if I do run SDLNet_GetLocalAddresses on W95 (with IE5.5, so the DLL is there) it just doesn't return any interfaces rather than causing a crash.

@sezero
Copy link
Contributor

sezero commented Apr 21, 2025

Re socklen_t, fixed;

Not fully, as it seems. socklen_t isn't a macro, it's a typedef, that's why I suggested the preprocessor check above: some macro that we know not being present in winsock 1.1 headers but present in winsock2 headers.

Besides: You aren't changing winsock includes to winsock 1.1 version and not providing any macro magic to select winsock 1.1 like #42 does: You mention support for very old SDKs, are you saying that those old SDKs have winsock2 headers?

@sezero
Copy link
Contributor

sezero commented Apr 21, 2025

OK, looked at MSVC6, it does have winsock2 headers but doesn't provide socklen_t. Its winsock2 headers (ws2tcpip.h) doesn't define IP_MSFILTER_SIZE either, so the preprocessor check I suggested above is valid for it.

@ElpisActual
Copy link
Author

I'm using the slightly later April 1999 SDK, but it seems to have the same version of WS2TCPIP.H as VC++6, so I have applied your suggestion.

@sezero sezero merged commit 641475e into libsdl-org:SDL-1.2 Apr 21, 2025
@sezero
Copy link
Contributor

sezero commented Apr 21, 2025

OK, I squashed and merged this.

If @ccawley2011 revises #42, it can be re-reviewed, too.

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