aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-14 11:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: VC++ 2012 partial support

Browse source
This commit is contained in:
kervala 2012-11-24 20:26:55 +01:00
parent f52c7eb1a6
commit 01585a53a7
1 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
code/nel/include/nel/misc/types_nl.h
View file

@ -48,32 +48,44 @@
# define NL_OS_WINDOWS # define NL_OS_WINDOWS
# define NL_LITTLE_ENDIAN # define NL_LITTLE_ENDIAN
# define NL_CPU_INTEL # define NL_CPU_INTEL
# ifndef _WIN32_WINNT # ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0500 // Minimal OS = Windows 2000 (NeL is not supported on Windows 95/98) # define _WIN32_WINNT 0x0500 // Minimal OS = Windows 2000 (NeL is not supported on Windows 95/98)
# endif # endif
# if _MSC_VER >= 1600 # ifdef _MSC_VER
# define NL_COMP_VC10 # define NL_COMP_VC
# elif _MSC_VER >= 1500 # if _MSC_VER >= 1700
# define NL_COMP_VC9 # define NL_COMP_VC11
# elif _MSC_VER >= 1400 # define NL_COMP_VC_VERSION 110
# define NL_COMP_VC8 # elif _MSC_VER >= 1600
# undef nl_time # define NL_COMP_VC10
# define nl_time _time32 // use the old 32 bit time function # define NL_COMP_VC_VERSION 100
# undef nl_mktime # elif _MSC_VER >= 1500
# define nl_mktime _mktime32 // use the old 32 bit time function # define NL_COMP_VC9
# undef nl_gmtime # define NL_COMP_VC_VERSION 90
# define nl_gmtime _gmtime32 // use the old 32 bit time function # elif _MSC_VER >= 1400
# undef nl_localtime # define NL_COMP_VC8
# define nl_localtime _localtime32 // use the old 32 bit time function # define NL_COMP_VC_VERSION 80
# undef nl_difftime # undef nl_time
# define nl_difftime _difftime32 // use the old 32 bit time function # define nl_time _time32 // use the old 32 bit time function
# elif _MSC_VER >= 1310 # undef nl_mktime
# define NL_COMP_VC71 # define nl_mktime _mktime32 // use the old 32 bit time function
# elif _MSC_VER >= 1300 # undef nl_gmtime
# define NL_COMP_VC7 # define nl_gmtime _gmtime32 // use the old 32 bit time function
# elif _MSC_VER >= 1200 # undef nl_localtime
# define NL_COMP_VC6 # define nl_localtime _localtime32 // use the old 32 bit time function
# define NL_COMP_NEED_PARAM_ON_METHOD # undef nl_difftime
# define nl_difftime _difftime32 // use the old 32 bit time function
# elif _MSC_VER >= 1310
# define NL_COMP_VC71
# define NL_COMP_VC_VERSION 71
# elif _MSC_VER >= 1300
# define NL_COMP_VC7
# define NL_COMP_VC_VERSION 70
# elif _MSC_VER >= 1200
# define NL_COMP_VC6
# define NL_COMP_VC_VERSION 60
# define NL_COMP_NEED_PARAM_ON_METHOD
# endif
# endif # endif
# if defined(_HAS_TR1) && (_HAS_TR1 + 0) // VC9 TR1 feature pack or later # if defined(_HAS_TR1) && (_HAS_TR1 + 0) // VC9 TR1 feature pack or later
# define NL_ISO_STDTR1_AVAILABLE # define NL_ISO_STDTR1_AVAILABLE
@ -320,7 +332,7 @@ typedef unsigned int uint; // at least 32bits (depend of processor)
# define CHashMap std::tr1::unordered_map # define CHashMap std::tr1::unordered_map
# define CHashSet std::tr1::unordered_set # define CHashSet std::tr1::unordered_set
# define CHashMultiMap std::tr1::unordered_multimap # define CHashMultiMap std::tr1::unordered_multimap
#elif defined(NL_COMP_VC7) || defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) // VC7 through 9 #elif defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 70 && NL_COMP_VC_VERSION <= 90) // VC7 through 9
# include <hash_map> # include <hash_map>
# include <hash_set> # include <hash_set>
# define CHashMap stdext::hash_map # define CHashMap stdext::hash_map
@ -366,7 +378,7 @@ typedef uint16 ucchar;
// To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234) // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234)
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# if defined(NL_COMP_VC8) || defined(NL_COMP_VC9) || defined(NL_COMP_VC10) # if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 80)
# define INT64_CONSTANT(c) (c##LL) # define INT64_CONSTANT(c) (c##LL)
# define SINT64_CONSTANT(c) (c##LL) # define SINT64_CONSTANT(c) (c##LL)
# define UINT64_CONSTANT(c) (c##LL) # define UINT64_CONSTANT(c) (c##LL)