diff options
Diffstat (limited to 'src/common/CompilerDefs.h')
| -rw-r--r-- | src/common/CompilerDefs.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/common/CompilerDefs.h b/src/common/CompilerDefs.h index 05a7b090560..4003fbe77e9 100644 --- a/src/common/CompilerDefs.h +++ b/src/common/CompilerDefs.h @@ -21,30 +21,21 @@ #define TRINITY_PLATFORM_WINDOWS 0 #define TRINITY_PLATFORM_UNIX 1 #define TRINITY_PLATFORM_APPLE 2 -#define TRINITY_PLATFORM_INTEL 3 -// must be first (win 64 also define _WIN32) -#if defined( _WIN64 ) +#if defined( _WIN32 ) # define TRINITY_PLATFORM TRINITY_PLATFORM_WINDOWS -#elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 ) -# define TRINITY_PLATFORM TRINITY_PLATFORM_WINDOWS -#elif defined( __APPLE_CC__ ) +#elif defined( __APPLE__ ) # define TRINITY_PLATFORM TRINITY_PLATFORM_APPLE -#elif defined( __INTEL_COMPILER ) -# define TRINITY_PLATFORM TRINITY_PLATFORM_INTEL #else # define TRINITY_PLATFORM TRINITY_PLATFORM_UNIX #endif #define TRINITY_COMPILER_MICROSOFT 0 #define TRINITY_COMPILER_GNU 1 -#define TRINITY_COMPILER_BORLAND 2 -#define TRINITY_COMPILER_INTEL 3 +#define TRINITY_COMPILER_INTEL 2 #ifdef _MSC_VER # define TRINITY_COMPILER TRINITY_COMPILER_MICROSOFT -#elif defined( __BORLANDC__ ) -# define TRINITY_COMPILER TRINITY_COMPILER_BORLAND #elif defined( __INTEL_COMPILER ) # define TRINITY_COMPILER TRINITY_COMPILER_INTEL #elif defined( __GNUC__ ) |