Unified · Split
| @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) · 59 unmodified lines | ||
| 60 | 60 | _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); |
| 61 | 61 | #endif |
| 62 | 62 | |
| 63 | −#if SDL_PATCHLEVEL < 5 | |
| 63 | +#if SDL_MAJOR_VERSION == 2 && SDL_MINOR_VERSION == 0 && SDL_PATCHLEVEL < 5 | |
| 64 | 64 | #pragma message("WARNING: The SDL2 dev lib is older than ver 2.0.5. You'll get fullscreen mode issues and no audio input sampling.") |
| 65 | 65 | #pragma message("At least version 2.0.7 is recommended.") |
| 66 | 66 | #endif |
| @@ -93,12 +93,13 @@ int main(int argc, char *argv[]) · 26 unmodified lines | ||
| 93 | 93 | } |
| 94 | 94 | #endif |
| 95 | 95 | |
| 96 | −#if SDL_PATCHLEVEL >= 4 // SDL 2.0.4 or later | |
| 97 | − SDL_SetHint(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4, "1"); // windows only - prevent ALT+F4 from exiting (FT2 uses ALT+F4) | |
| 96 | +#ifdef _WIN32 | |
| 97 | + | |
| 98 | + // ALT+F4 is used in FT2, but is "close program" in Windows... | |
| 99 | +#if SDL_MAJOR_VERSION == 2 && SDL_MINOR_VERSION >= 0 && SDL_PATCHLEVEL >= 4 | |
| 100 | + SDL_SetHint(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4, "1"); | |
| 98 | 101 | #endif |
| 99 | 102 | |
| 100 | −#ifdef _WIN32 | |
| 101 | − | |
| 102 | 103 | #ifndef _MSC_VER |
| 103 | 104 | SetProcessDPIAware(); |
| 104 | 105 | #endif |
| @@ -126,7 +127,7 @@ int main(int argc, char *argv[]) · 21 unmodified lines | ||
| 126 | 127 | ** reinitialized in Windows and what not. |
| 127 | 128 | ** Ref.: https://bugzilla.libsdl.org/show_bug.cgi?id=4391 |
| 128 | 129 | */ |
| 129 | −#if defined _WIN32 && SDL_PATCHLEVEL == 9 | |
| 130 | +#if defined _WIN32 && SDL_MAJOR_VERSION == 2 && SDL_MINOR_VERSION == 0 && SDL_PATCHLEVEL == 9 | |
| 130 | 131 | if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) != 0) |
| 131 | 132 | #else |
| 132 | 133 | if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO) != 0) |