ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch wxw to compile on vs2015.

This commit is contained in:
Shawn Hoffman 2015-03-16 16:45:03 -07:00
parent 00afa2a328
commit dfc1f0a87e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Externals/wxWidgets3/include/wx/compiler.h vendored
View File

@ -53,6 +53,9 @@
# define __VISUALC11__ # define __VISUALC11__
#elif __VISUALC__ < 1900 #elif __VISUALC__ < 1900
# define __VISUALC12__ # define __VISUALC12__
#elif __VISUALC__ < 2000
/* There is no __VISUALC13__! */
# define __VISUALC14__
#else #else
# pragma message("Please update wx/compiler.h to recognize this VC++ version") # pragma message("Please update wx/compiler.h to recognize this VC++ version")
#endif #endif
@ -102,7 +105,13 @@
# define wxVISUALC_VERSION(major) 0 # define wxVISUALC_VERSION(major) 0
# define wxCHECK_VISUALC_VERSION(major) 0 # define wxCHECK_VISUALC_VERSION(major) 0
#else #else
# define wxVISUALC_VERSION(major) ( (6 + major) * 100 ) /*
Things used to be simple with the _MSC_VER value and the version number
increasing in lock step, but _MSC_VER value of 1900 is VC14 and not the
non existing (presumably for the superstitious reasons) VC13, so we now
need to account for this with an extra offset.
*/
# define wxVISUALC_VERSION(major) ( (6 + (major >= 14 ? 1 : 0) + major) * 100 )
# define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) ) # define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
#endif #endif