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

Add support for Visual Studio 2015, xdebug appears to no longer be available in Visual Studio 2015. So for now memtest must be disabled for Debug builds to operate correctly.

This commit is contained in:
Emmet Young 2015-09-23 23:23:11 +10:00
parent e6dd517b35
commit 7c2f30e840
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/3rd Party/wx/include/msvc/wx/setup.h
View File

@ -62,6 +62,10 @@
#define wxCOMPILER_PREFIX vc100 #define wxCOMPILER_PREFIX vc100
#elif _MSC_VER == 1700 #elif _MSC_VER == 1700
#define wxCOMPILER_PREFIX vc110 #define wxCOMPILER_PREFIX vc110
#elif _MSC_VER == 1800
#define wxCOMPILER_PREFIX vc120
#elif _MSC_VER == 1900
#define wxCOMPILER_PREFIX vc140
#else #else
#error "Unknown MSVC compiler version, please report to wx-dev." #error "Unknown MSVC compiler version, please report to wx-dev."
#endif #endif

6
Source/3rd Party/wx/include/wx/platform.h
View File

@ -437,7 +437,9 @@
# elif __VISUALC__ < 1800 # elif __VISUALC__ < 1800
# define __VISUALC11__ # define __VISUALC11__
# elif __VISUALC__ < 1900 # elif __VISUALC__ < 1900
# define __VISUALC12__ # define __VISUALC12__
# elif __VISUALC__ < 2000
# define __VISUALC14__
# else # else
# pragma message("Please update wx/platform.h to recognize this VC++ version") # pragma message("Please update wx/platform.h to recognize this VC++ version")
# endif # endif
@ -523,7 +525,7 @@
# 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 ) # 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

3
Source/Common/MemTest.h
View File

@ -1,5 +1,8 @@
#ifdef _DEBUG #ifdef _DEBUG
#if (defined(_MSC_VER) && (_MSC_VER < 1900))
#define MEM_LEAK_TEST #define MEM_LEAK_TEST
#endif
#ifdef MEM_LEAK_TEST #ifdef MEM_LEAK_TEST