From fdd44f70dd0abe5a4b1052a97a004a10de336824 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 3 Sep 2024 12:06:16 +0200 Subject: Core/Misc: CompilerDefs/GitRevision improvements * Removed INTEL as a separate platform (it does not belong there) * Removed BORLAND from known compilers list (it was never supported) * Simplified TRINITY_PLATFORM_WINDOWS detection (_WIN32 is always defined) * Rename revision_data.h macros that begin with a underscore * Added processor architecture to --version string * Added Linux distribution name to .server debug * Fixed some revision_data.h macros missing/wrong values when regenerated during compilation * Removed manual adding of _WIN64 macro from cmake (it is predefined internally by compiler) (cherry picked from commit e8740fb2e125b308493aeab49ddd7b0cc6a53c97) # Conflicts: # revision_data.h.in.cmake --- src/common/CompilerDefs.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/common/CompilerDefs.h') 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__ ) -- cgit v1.2.3