Added __WINDOWS__ to reflect both 32 and 64-bit windows platforms

main
Sam Lantinga 2013-10-20 20:41:30 -07:00
parent d710399671
commit 04e170ceb7
2 changed files with 5 additions and 6 deletions

View File

@ -1,15 +1,10 @@
Future work roadmap: Future work roadmap:
* http://wiki.libsdl.org/moin.cgi/Roadmap * http://wiki.libsdl.org/moin.cgi/Roadmap
* See why windows are being rearranged. Is the shield window not up?
* Add __WINDOWS__ in addition to __WIN32__
* Write test for fullscreen gamma to check X11 colormap handling
* Check 1.2 revisions: * Check 1.2 revisions:
3554 - Need to resolve semantics for locking keys on different platforms 3554 - Need to resolve semantics for locking keys on different platforms
4874 - Do we want screen rotation? At what level? 4874 - Do we want screen rotation? At what level?
4974 - Windows file code needs to convert UTF-8 to Unicode, but we don't need to tap dance for Windows 95/98 4974 - Windows file code needs to convert UTF-8 to Unicode, but we don't need to tap dance for Windows 95/98
4484, 4485 - Verify that SDL's Windows keyboard handling works correctly
4865 - See if this is still needed (mouse coordinate clamping) 4865 - See if this is still needed (mouse coordinate clamping)
4866 - See if this is still needed (blocking window repositioning) 4866 - See if this is still needed (blocking window repositioning)

View File

@ -121,8 +121,12 @@
#define __SOLARIS__ 1 #define __SOLARIS__ 1
#endif #endif
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
#undef __WINDOWS__
#define __WINDOWS__ 1
#endif
#if defined(__WINDOWS__)
#undef __WIN32__ #undef __WIN32__
#define __WIN32__ 1 #define __WIN32__ 1
#endif #endif
#if defined(__PSP__) #if defined(__PSP__)
#undef __PSP__ #undef __PSP__